updated license, cleaned readme

aehmttw · Jul 8, 2018 · 4d8f0dc · 4d8f0dc
1 parent d71f076
commit 4d8f0dc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright 2018 Matei Budiu
+Copyright 2018 Matei Budiu, Karan Gurazada
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README.md b/README.md
@@ -1,12 +1,8 @@
 # TankGame
-<<<<<<< HEAD
 ## This is a README file. Repeat - This is a README file.
 Please read the README.md file.
 
 TankGame is amazing and wondrous and beautiful and was created by Matei Budiu and Karan Gurazada.
 It is, as one suspects, a game involving all sorts of tanks (12?) and really a natural extension of the Wii Play tanks game.
 It is still very much in development and is also extremely difficult (as in unplayable).
 
-=======
-This is a game with tanks.
->>>>>>> 437aa930943438d16130d2af63e00812c9eed8aa