fixed merge conflict
[xtuple] / .gitignore
1 *.DS_Store
2 *.swp
3 *.swo
4 *~
5 *.deb
6 node_modules
7 npm-debug.log
8 scripts/private
9 scripts/lib/temp_query*
10 scripts/1
11 scripts/lib/build
12 scripts/lib/deploy
13 scripts/lib/package.js
14 test/mocha/lib/demo-test.backup
15 test/shared/login_data.js