From d5dbd6f55ce622444774cc8e3f741ef2d524aa5c Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Fri, 15 Feb 2019 14:54:40 +1100
Subject: [PATCH] Fri Feb 15 2019 14:54:39 GMT+1100 (AUS Eastern Daylight Time)

---
 01/title.txt    | 6 +-----
 front/title.txt | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/01/title.txt b/01/title.txt
index 48d9d5a..4dd4ec3 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Sapta 1
-=======
-Ilal 1
->>>>>>> c94126e8d8dc2f5aada2a103590b325bd441f45a
+Sapta 1
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index b2459fd..83943a6 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Mak
-=======
-Mak irlal gorete
->>>>>>> c94126e8d8dc2f5aada2a103590b325bd441f45a
+Mak
\ No newline at end of file