From 093d92d4f51b669e20d2edfb3d797b75a48395d2 Mon Sep 17 00:00:00 2001
From: faustin-azaza <>
Date: Tue, 20 Feb 2018 18:52:01 +0800
Subject: [PATCH] auto save

---
 front/title.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 33c4ab0b..d225300b 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-MATAYO
-=======
 Matayo
->>>>>>> refs/heads/new