2dbf06c fix merge conflict in .gitignore

Merged and Committed by raveit65 10 years ago
    fix merge conflict in .gitignore
    
        
file modified
+1 -3
file modified
+38 -14
file modified
+1 -1