Change...

README.md

@@ -21,16 +21,29 @@ Platinum is a hobby project entirely managed and written by the community. It is
 4. Open the downloaded file then let Platinum install!
 
 ## Building from source
+<<<<<<< HEAD
 
+=======
+>>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
 Run
 ```
 git clone https://github.com/redstone-scratch/Platinum && cd Platinum
 npm/pnpm install
 npm/pnpm run tailwind:once
 npm/pnpm run make
 ```
+<<<<<<< HEAD
 The output is in the out directory.
 
+=======
+
+The output is in the out directory.
+
+## About this fork
+
+This fork is not supposed to replace Platinum, it is more of a testbed for the more stable Platinum releases.
+
+>>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
 ## Contributors
 
-This section will update automatically as we get contribut*o*rs.
+This section will update automatically as we get contribut*o*rs.

src/bookmarks.js

@@ -67,10 +67,15 @@ function updateBookmarksVar() {
  * Stores the bookmarks in localstorage and runs updateBookmarksVar
  */
 function storeBookmarks() {
+<<<<<<< HEAD
   if (bookmarks.length === 0) bookmarksBar.classList.add("hidden");
   // else bookmarksBar.classList.remove("hidden");
+=======
+	if (bookmarks.length === 0) bookmarksBar.classList.add("hidden");
+	//else bookmarksBar.classList.remove("hidden");
+>>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
 	window.localStorage.setItem("bookmarks", JSON.stringify(bookmarks));
 	updateBookmarksVar();
 }
 
-addBookmarkToBar('https://co.wukko.me/', 'Upload')
+//addBookmarkToBar('https://co.wukko.me/', 'Upload')

src/getChangeLogs.js

@@ -10,7 +10,7 @@ fetch("../package.json")
                 const desc = document.getElementById('desc');
                 desc.innerHTML = marked.parse(res.body);
                 });
-            });
+        });
 
 function getVerDisp() {
     fetch("../package.json") 

src/tabs.js

@@ -152,4 +152,10 @@ function handleTabShortcuts(e) {
         document.querySelector('.current').reload();
         e.preventDefault();
     }
+<<<<<<< HEAD
+=======
+    if (isModifier && e.key === "u") {
+        alert('dunno how to open devtools :(')
+    }
+>>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
 };