[Octave-cvsupdate] SF.net SVN: octave:[10238] trunk/octave-forge/main/vrml/inst/vrml_frame.m

[<car...@us...>]

Revision: 10238
          http://octave.svn.sourceforge.net/octave/?rev=10238&view=rev
Author:   carandraug
Date:     2012-04-16 09:35:51 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
vrml_frame: fix error commited on r10219 due to conflict of revisions

Revision Links:
--------------
    http://octave.svn.sourceforge.net/octave/?rev=10219&view=rev

Modified Paths:
--------------
    trunk/octave-forge/main/vrml/inst/vrml_frame.m

Modified: trunk/octave-forge/main/vrml/inst/vrml_frame.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-16 09:34:06 UTC (rev 10237)
+++ trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-16 09:35:51 UTC (rev 10238)
@@ -47,17 +47,9 @@
 ######################################################################
 ## Read options
 numeric_args = 0;
-<<<<<<< .mine
 args = nargin;  # nargin is now a function
 while args && numeric_args<2 && numeric_args<numel(varargin)
   tmp = varargin{numeric_args + 1};
-=======
-args = nargin; # nargin is now a function
-while args && numeric_args<2,
-
-
-  tmp = varargin{numeric_args + 1};
->>>>>>> .r10218
   if ischar (tmp), break; end
   --args;
   numeric_args++;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.