From 840b47e8896ada08f234f1d4ad0986d0f43df524 Mon Sep 17 00:00:00 2001
From: Alireza Adli <alireza.adli@mail.concordia.ca>
Date: Wed, 9 Aug 2023 18:57:25 -0400
Subject: [PATCH] change to the original readme

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 26c12f10..6de17536 100644
--- a/README.md
+++ b/README.md
@@ -79,12 +79,7 @@ and technical support.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-<<<<<<< HEAD
     along with this program. If not, see <http://www.gnu.org/licenses/>.
-    [Testing from windows]
-=======
-    along with this program. If not, see <http://www.gnu.org/licenses/>.    
->>>>>>> 03070a0b088748f380da442c2df87fc41ccf15ef
 
 ## Contributors
 <!-- this section is updated using external bot, see https://allcontributors.org/docs/en/bot/usage - post comment like
@@ -130,4 +125,3 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 Even more thanks go to Colouring Cities contributors, funders, project partners, consultees,
 advisers, supporters and friends - [everyone involved in the
 project](https://www.pages.colouring.london/whoisinvolved).
-