Undo incorrect code changes made during merge conflict.

[netvirt.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100755 (executable)
new mode 100644 (file)
index ee0c372..9cb68e1
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,15 @@ log.html
 output.xml
 report.html
 *.swp
-.gitignore
 target-ide/
+.tox
+.vagrant
+.DS_Store
+.checkstyle
+.factorypath
+yang-gen-config
+yang-gen-sal
+maven-metadata-local.xml
+.metadata
+.recommenders
+/.gitignore