added logo

kiacolbert · kiacolbert · commit 021d5ab752bb · 2019-03-20T22:25:17.000-04:00
diff --git a/src/browser/chrome/manifest.json b/src/browser/chrome/manifest.json
@@ -4,11 +4,9 @@
   "description": "Time travel",
   "manifest_version": 2,
   "page_action": {
-    // "default_icon": {
-    //   "16": "images/icon16.png",          
-    //   "24": "images/icon24.png",          
-    //   "32": "images/icon32.png"   
-    // },
+    "default_icon": {        
+      "32": "images/greygreen_logo_150w.png"   
+    },
     "default_popup": "page_action.html"
   },
   "background": {
diff --git a/src/browser/chrome/page_action.html b/src/browser/chrome/page_action.html
@@ -30,16 +30,10 @@
   </style>
 </head>
 <body>
-<<<<<<< HEAD
   <p><strong>React Rewind</strong></p>
   <p>Open Chrome developer tools, React Rewind tab is on the right.</p>
   <a href="https://rewindjs.io">rewindjs.io</a>
   <a href="https://github.com/reactrewind/react-rewind">Github</a>
-=======
-  Page Action
-  <a href="http://www.google.com">Test - goto google</a>
-  <button id="color_btn">CHANGE COLOR!</button>
->>>>>>> 8fabb46fbb01219265af96cfaf4cdb9fd47d514e
   <script src="page_action.js"></script>
   <script type="text/javascript" src="devtools.js"></script>
 </body>
