gagamel 5 anos atrás
pai
commit
5a0888d36b
3 arquivos alterados com 3 adições e 9 exclusões
  1. 3 1
      style24.admin/.gitignore
  2. 0 4
      style24.core/.gitignore
  3. 0 4
      style24.scm/.gitignore

+ 3 - 1
style24.admin/.gitignore

@@ -1 +1,3 @@
-/target/
+target/
+.settings/
+.classpath

+ 0 - 4
style24.core/.gitignore

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-/target/
-=======
 target/
 .settings/
 .classpath
->>>>>>> refs/heads/eskim

+ 0 - 4
style24.scm/.gitignore

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-/target/
-=======
 target/
 .settings/
 .classpath
->>>>>>> refs/heads/eskim