Merge branch 'main' of https://github.com/car-axle-client/car-axle-cl…

…ient into main
penguinify · Dec 28, 2023 · a2b966c · a2b966c
2 parents 5a92c69 + 820e6de
commit a2b966c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -27,9 +27,8 @@
 
 </div>
 
-## NOTICE
-
-A recent update to ChromeOS (v115/v116) released in August 2023 has blocked all javascript: and javascript:// bookmarklets. If you use a managed Chromebook and **Devtools are turned off** (that means Inspect element, etc.) (they must be turned off or bookmarklets still work) then the Car Axle Client Bookmarklet won't work. You can still use an [about:blank Injector however](https://disnos9.github.io/jsinject/) but some features won't work. (Things like history flooder, scripts, etc.)
+> [!NOTE]
+>A recent update to ChromeOS (v115/v116) released in August 2023 has blocked all javascript: and javascript:// bookmarklets. If you use a managed Chromebook and **Devtools are turned off** (that means Inspect element, etc.) (they must be turned off or bookmarklets still work) then the Car Axle Client Bookmarklet won't work. You can still use an [about:blank Injector however](https://disnos9.github.io/jsinject/) but some features won't work. (Things like history flooder, scripts, etc.)
 
 ## Features
 

diff --git a/docs/openinhtmlfile.md b/docs/openinhtmlfile.md
@@ -16,15 +16,12 @@
 
 2. You should save it to a folder named whatever you want, just make it in a safe place.
 3. Now its time to download the games, you may skip this part if you are fine with the normal game hosters. Now download the games here:
-<<<<<<< HEAD
 
 -   https://github.com/car-axle-client/gay-hosting-v3
 
 4. Make sure you download the archive and extract it once done. (Click the green code button and click download zip)
-=======
 - https://github.com/car-axle-client/gay-hosting-v3
-4. Make sure you download the archive and extract it once done. (Click the green code button and click download zip)       
->>>>>>> branch 'main' of https://github.com/car-axle-client/car-axle-client
+
 5. Move the extracted folder CONTENT (THE THINGS INSIDE OF THE FOLDER) to the same folder as the build.js file. (Makes the next steps easier)
 
 ### Step 2: Setting up the html wrapper.