From 9c218eabcdb5f2b47577d088e9e32207cffce4e6 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Tue, 19 Apr 2016 21:32:05 +0400
Subject: [PATCH] Removing changes

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e53b75b4..cd6ee3e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,9 +85,3 @@ build/android/path.cfg
 build/android/and_env
 build/android/AndroidManifest.xml
 timestamp
-<<<<<<< HEAD
-
-## Backup files
-*backup.tar.gz
-=======
->>>>>>> bca616493783b18b2f280d4773cb4be41d01c434