From 9e3220737ca9946492612905fbd8a1f0ad8f5d13 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 22 Jan 2019 14:14:27 -0800
Subject: [PATCH] Merge error.

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

diff --git a/.gitignore b/.gitignore
index 29c3c32653..5a965b494c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,10 +104,6 @@ tools/unity-avatar-exporter/Logs
 tools/unity-avatar-exporter/Packages
 tools/unity-avatar-exporter/ProjectSettings
 tools/unity-avatar-exporter/Temp
-<<<<<<< HEAD
-
-=======
 server-console/package-lock.json
 vcpkg/
 /tools/nitpick/compiledResources
->>>>>>> c199654ded854157b9d11b6ede1b867b46356102