Index: runtime/observatory/lib/src/elements/isolate_summary.html |
diff --git a/runtime/observatory/lib/src/elements/isolate_summary.html b/runtime/observatory/lib/src/elements/isolate_summary.html |
index 42d863e3c5bf442f05d425bd2b2c05752023562c..5cffd6cf97a062949f690661c79ce30a2f2d7f7b 100644 |
--- a/runtime/observatory/lib/src/elements/isolate_summary.html |
+++ b/runtime/observatory/lib/src/elements/isolate_summary.html |
@@ -4,8 +4,13 @@ |
<link rel="import" href="isolate_ref.html"> |
<link rel="import" href="script_inset.html"> |
Cutch
2016/07/25 14:08:21
ditto
cbernaschina
2016/07/25 15:57:13
Done.
|
+<<<<<<< 3c295de444a82389503022ca4d8d7ed6065728f1 |
<link rel="import" href="script_ref.html"> |
<polymer-element name="isolate-summary"> |
+======= |
+ |
+<polymer-element name="isolate-summary" extends="observatory-element"> |
+>>>>>>> Removed references from other elements |
<template> |
<link rel="stylesheet" href="css/shared.css"> |
<div class="flex-row"> |