New analyzer snapshot.

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

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 30 matching lines @@
    */
   private boolean dart2jsHint = true;
 
   /**
    * A flag indicating whether analysis is to generate hint results (e.g. type inference based
    * information and pub best practices).
    */
   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;
 
   /**
    * Initialize a newly created set of analysis options to have their default values.
    */
   public AnalysisOptionsImpl() {
   }
 
   /**
@@ skipping 89 matching lines @@
 
   /**
    * Set whether analysis is to parse comments.
    * 
    * @param preserveComments {@code true} if analysis is to parse comments
    */
   public void setPreserveComments(boolean preserveComments) {
     this.preserveComments = preserveComments;
   }
 }