From 41acb9638c89a9edd355c7c2a5ded326cb79a502 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Tue, 28 Mar 2023 13:57:19 -0600 Subject: [PATCH 01/12] Hotfix: Games Page --- src/pages/games/index.astro | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/pages/games/index.astro b/src/pages/games/index.astro index 6efabb7..5c2ca3c 100644 --- a/src/pages/games/index.astro +++ b/src/pages/games/index.astro @@ -16,6 +16,7 @@ import '../../styles/globals.css';

Games

+<<<<<<< HEAD Shooter +======= + + +
+
+ + +>>>>>>> 433159c (Hotfix: Games Page)
From 9c6a0c10ac1a26565552909aace7af5428c79a0f Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Tue, 28 Mar 2023 14:28:25 -0600 Subject: [PATCH 02/12] Build ERROR --- src/pages/games/index.astro | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/games/index.astro b/src/pages/games/index.astro index 5c2ca3c..6a387d7 100644 --- a/src/pages/games/index.astro +++ b/src/pages/games/index.astro @@ -16,7 +16,6 @@ import '../../styles/globals.css';

Games

-<<<<<<< HEAD Shooter -======= - - - - - - - - - - - - - - - - -
+ +
+ +
->>>>>>> 433159c (Hotfix: Games Page) -
- -