Fixed automatic Merge error with vm-nav-menu branch

runtime/observatory/lib/src/elements/nav_bar.html

 <link rel="import" href="../../../../packages/polymer/polymer.html">
 <link rel="import" href="action_link.html">
 <link rel="import" href="observatory_element.html">
 
-<polymer-element name="vm-nav-menu">
-  <template>
-    <nav-menu link="/vm" anchor="{{ nameAndAddress(vm.name, vm.target) }}" last="{{ last }}">
-      <template repeat="{{ isolate in vm.isolates }}">
-        <nav-menu-item link="{{ makeLink('/inspect', isolate) }}"
-                       anchor="{{ isolate.name }}"></nav-menu-item>
-      </template>
-      <content></content>
-    </nav-menu>
-  </template>
-</polymer-element>
-
 <polymer-element name="library-nav-menu" extends="observatory-element">
   <template>
     <nav-menu link="{{ makeLink('/inspect', library) }}"
               anchor="{{ library.name }}" last="{{ last }}">
       <content></content>
     </nav-menu>
   </template>
 </polymer-element>
 
 <polymer-element name="class-nav-menu" extends="observatory-element">
@@ skipping 246 matching lines @@
         [<a class="link" on-click="{{ goto }}"
             _href="{{ gotoLink('vm-connect') }}">Connect to a different VM</a>]
         <a class="boxclose" on-click="{{ closeItem }}">&times;</a>
     </div>
     </template>
   </template>
 </polymer-element>
 
 
 <script type="application/dart" src="nav_bar.dart"></script>