Index: runtime/observatory/lib/src/elements/field_view.html |
diff --git a/runtime/observatory/lib/src/elements/field_view.html b/runtime/observatory/lib/src/elements/field_view.html |
index bfa243b40fcd297cb7b410e42a0f57f44422237e..36a19c640ca7e37310d28e2e73f7ef856b8d3c66 100644 |
--- a/runtime/observatory/lib/src/elements/field_view.html |
+++ b/runtime/observatory/lib/src/elements/field_view.html |
@@ -3,7 +3,11 @@ |
<link rel="import" href="instance_ref.html"> |
<link rel="import" href="library_ref.html"> |
<link rel="import" href="nav_bar.html"> |
+<<<<<<< 3c295de444a82389503022ca4d8d7ed6065728f1 |
<link rel="import" href="script_ref.html"> |
+======= |
Cutch
2016/07/25 14:08:21
bad merge
cbernaschina
2016/07/25 15:57:13
Done.
|
+<link rel="import" href="observatory_element.html"> |
+>>>>>>> Removed references from other elements |
<polymer-element name="field-view"> |