Fix bad merge in CommandLineOptions.java (broke build at r6076)

compiler/java/com/google/dart/compiler/CommandLineOptions.java

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 package com.google.dart.compiler;
 
 import com.google.common.collect.Lists;
 import com.google.dart.compiler.CompilerConfiguration.ErrorFormat;
 
 import org.kohsuke.args4j.Argument;
@@ skipping 157 matching lines @@
      * Returns whether the compiler should attempt to incrementally recompile.
      */
     public boolean buildIncrementally() {
       return incremental;
     }
 
     public boolean shouldBatch() {
       return batch;
     }
 
+    public boolean resolveDespiteParseErrors() {
+      return resolveDespiteParseErrors;
+    }
+    
     /**
      * Returns <code>true</code> if the compiler should print it's help message.
      */
     public boolean showHelp() {
       return showHelp;
     }
 
     public boolean showJvmMetrics() {
       return showJvmMetrics;
     }
@@ skipping 88 matching lines @@
           args = newArgs.toArray(new String[newArgs.size()]);
           cmdLineParser = new CmdLineParser(parsedOptions);
           continue;
         }
       }
       break;
     }
     return cmdLineParser;
   }
 }