removed leftover merge text
[henge/kiak.git] / .gitignore
1 node_modules/
2 .tern-project
3 *~
4 .remote-sync.json