From 0b003e93bfd3b8d00f694a874780d4afe68866e5 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Tue, 18 Feb 2020 16:45:08 +0700
Subject: [PATCH] Tue Feb 18 2020 16:45:08 GMT+0700 (Tomsk Standard Time)

---
 01/title.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/01/title.txt b/01/title.txt
index 7f964d0..9d90cd9 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Pasal 1
-=======
-PASAL 1
->>>>>>> 934149df76ddcfbf4cc6457421c05188bd2ad721
+Pasal 1
\ No newline at end of file