Actualiser README.md

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # TGTK
 TGTK(formerly MassShoot) is a game engine based on cubic geometry. Its map format is entirely composed of bounding boxes. This allows for simple to parse/write map files.
 
@@ -6,32 +5,3 @@ This is a mirror of the game I made for the Acerola Jam Zero.
 
 ## License
 The engine code is MIT. The assets are under all rights reserved.
-=======
-# Dead Weather
-
-My submission for the Acerola Jam Zero. 
-
-## Synopsis
-Dead Weather is a game where you have to defend a local TV station from a ghost attack to prevent it from getting hijacked.
-
-## Dependencies:
-### For building the game:
-- raylib
-- Chaiscript
-
-### For reading its garbage code:
-- alcohol
-- crack
-- caffeine
-- therapy
-- mescaline
-- lynks disease
-- a three-tiered pot
-- 12 gauge granular clay
-
-## About the code
-Trans Girl Toolkit / TGTK is an engine I've been cooking for the past few months. Its code is... uh... considered abstract art and is reminiscent of Jackson Pollock paintings.
-
-## License
-All rights reserved. For now at least.
->>>>>>> 948d2dd (Update README.md)