From d0ebd84d1f73da95c3b6b53c94c500cfaf93e9df Mon Sep 17 00:00:00 2001
From: dosse91 <dosse91@paranoici.org>
Date: Sat, 31 Aug 2019 19:32:36 +0200
Subject: [PATCH] Fixed .gitignore

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

diff --git a/.gitignore b/.gitignore
index 44b56d8..6432642 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 node_modules
 .idea
-=======
-results/idObfuscation_salt.php
-backend/getIP_serverLocation.php
->>>>>>> master
+