From 4d8f0dcbcdac0cc57c5fa1fb6b899d65732c0168 Mon Sep 17 00:00:00 2001 From: Karan Gurazada Date: Sun, 8 Jul 2018 00:40:18 -0700 Subject: [PATCH] updated license, cleaned readme --- LICENSE.md | 2 +- README.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 8c2dd05e..5fefb8f6 100644 --- 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 index ef8a1739..5b5c9a53 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # TankGame -<<<<<<< HEAD ## This is a README file. Repeat - This is a README file. Please read the README.md file. @@ -7,6 +6,3 @@ TankGame is amazing and wondrous and beautiful and was created by Matei Budiu an 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