diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/404.html b/404.html old mode 100644 new mode 100755 index ef64c88..6f2463b --- a/404.html +++ b/404.html @@ -32,11 +32,6 @@ @@ -70,10 +64,6 @@

Trying to access a page such as login, register, or a user page? Those are only available on official links.

Join the Discord to find official links.

-<<<<<<< HEAD - - -======= ->>>>>>> c2041b6 (first dev commit) diff --git a/manifest.json b/manifest.json old mode 100644 new mode 100755 diff --git a/new selenite.svg b/new selenite.svg old mode 100644 new mode 100755 diff --git a/package.json b/package.json deleted file mode 100644 index d5bf155..0000000 --- a/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "Bigfoot Games", - "version": "1.0.0", - "scripts": { - "start": "node index.js" - }, - "dependencies": { - "express": "^4.17.1" - } -} diff --git a/projects.html b/projects.html old mode 100644 new mode 100755 index 65d9df8..425d138 --- a/projects.html +++ b/projects.html @@ -17,13 +17,9 @@ -<<<<<<< HEAD - -======= ->>>>>>> c2041b6 (first dev commit) @@ -37,85 +33,6 @@ crossorigin="anonymous"> -<<<<<<< HEAD - -
- -
- -
- Home - Bookmarklets - Games - Apps - Settings - Open Blank - - -
-
- - - - -
- - - - -
-
- - -
- -

Starred Games

-

Star some games for things to show up here!

-
- -

All Games

-
-
- Add Game logo -

Suggest a game!

-
-

games loading..

-

games not loading? click ctrl + shift + r

- -
-
-
- - - -=======
@@ -144,6 +61,5 @@

nothing was found! try a new search query.

->>>>>>> c2041b6 (first dev commit) diff --git a/robots.txt b/robots.txt old mode 100644 new mode 100755 diff --git a/settings.html b/settings.html old mode 100644 new mode 100755 diff --git a/style.css b/style.css deleted file mode 100644 index 000c2c6..0000000 --- a/style.css +++ /dev/null @@ -1,3 +0,0 @@ -@import url("/css/style.css"); -@import url("/css/themes.css"); -/* moved to css folder */ \ No newline at end of file diff --git a/suggest.html b/suggest.html old mode 100644 new mode 100755 diff --git a/support.html b/support.html old mode 100644 new mode 100755