New analyzer snapshot.

editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/context/AnalysisOptionsImpl.java

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/context/AnalysisOptionsImpl.java
diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/context/AnalysisOptionsImpl.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/context/AnalysisOptionsImpl.java
index 5485092a147d363595933fba1754545238a6e675..969ea5aac0dc8f2df6d46a2ef400e8cd37b6f885 100644
--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/context/AnalysisOptionsImpl.java
+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/context/AnalysisOptionsImpl.java
@@ -48,13 +48,12 @@ public class AnalysisOptionsImpl implements AnalysisOptions {
   private boolean hint = true;
 
   /**
-   * <<<<<<< HEAD A flag indicating whether incremental analysis should be used.
+   * A flag indicating whether incremental analysis should be used.
    */
   private boolean incremental = false;
 
   /**
-   * A flag indicating whether analysis is to parse references in documentation comments. ======= A
-   * flag indicating whether analysis is to parse comments. >>>>>>> Java changes.
+   * flag indicating whether analysis is to parse comments.
    */
   private boolean preserveComments = true;