@@ -1,7 +1,3 @@
-<<<<<<< HEAD
node_modules
.idea
-=======
-results/idObfuscation_salt.php
-backend/getIP_serverLocation.php
->>>>>>> master
+
dosse91