Mercurial > octave

changeset 22634:abfb538acc59 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix error in previous commit. * scripts/ode/odeset.m : finish resolving conflicts in merge from revision b9f31d41ab66
author Carlo de Falco <carlo.defalco@polimi.it>
date Mon, 17 Oct 2016 11:55:26 +0200
parents b9f31d41ab66
children aace27d19162
files scripts/ode/odeset.m
diffstat 1 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ode/odeset.m	Mon Oct 17 11:44:42 2016 +0200
+++ b/scripts/ode/odeset.m	Mon Oct 17 11:55:26 2016 +0200
@@ -181,10 +181,6 @@
     p.addParameter ("Stats", []);
     p.addParameter ("Vectorized", []);
     p.KeepUnmatched = true;
-<<<<<<< local
-=======
-
->>>>>>> other
   endif
 
   if (nargin == 0 && nargout == 0)
@@ -202,15 +198,9 @@
                   struct2cell (odestruct),
                   "UniformOutput", false);
 
-<<<<<<< local
     s2 = cellfun (@(x) ifelse (iscell (x), {x}, x),
                   struct2cell (odestruct_extra),
                   "UniformOutput", false);
-=======
-    s2 = cellfun (@(x) ifelse (iscell(x), {x}, x),
-                  struct2cell(odestruct_extra),
-                  'UniformOutput', false);
->>>>>>> other
 
     C = [fieldnames(odestruct)       s1;
          fieldnames(odestruct_extra) s2];
@@ -313,11 +303,8 @@
 %!error <argument 'OPT1' is not a valid parameter> odeset (odeset (), "opt1")
 %!error  odeset (odeset (), 1, 1)
 
-<<<<<<< local
-=======
 ##FIXME: Add not exact match option
 ## %!warning <no exact match for 'Rel'.  Assuming 'RelTol'> odeset ("Rel", 1);
 ## %!error <Possible fields found: InitialSlope, InitialStep> odeset ("Initial", 1)
 
 
->>>>>>> other