From 669d703d0c22207d753256db6ecf7100a888d1f4 2017-10-03 15:10:20
From: José Chávez <jsergio.chavez@gmail.com>
Date: 2017-10-03 15:10:20
Subject: [PATCH] gitignore actualizado

---

diff --git a/.gitignore b/.gitignore
index 5294a6f..9c1e2ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,33 +100,16 @@ ENV/
 # eclipse
 .project
 .pydevproject
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> v2.3
-
 # vscode
 
 .vscode
 
 schaingui/node_modules/
 schainpy/scripts/
-<<<<<<< HEAD
-=======
 .svn/
 *.png
 *.pyc
 schainpy/scripts
 .vscode
-schaingui/node_modules
 trash
->>>>>>> master
-=======
-schaingui/node_modules/
-.svn/
-*.png
-*.pyc
-*.xml
 *.log
-trash
->>>>>>> v2.3