Fixed automatic Merge error with vm-nav-menu branch

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

Index: runtime/observatory/lib/src/elements/nav_bar.html
diff --git a/runtime/observatory/lib/src/elements/nav_bar.html b/runtime/observatory/lib/src/elements/nav_bar.html
index e451fa08abc513f464e9061039311327b2d73d1e..cb52f237c4c35b3bd487784134a82407f572ecd6 100644
--- a/runtime/observatory/lib/src/elements/nav_bar.html
+++ b/runtime/observatory/lib/src/elements/nav_bar.html
@@ -2,18 +2,6 @@
 <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) }}"