Conflicts: .gitignore .gitmodules LICENSE demo/boot.js demo/startup.js lib/ace/editor.js support/cockpit
15 lines
233 B
Text
15 lines
233 B
Text
# Junk that could exist anywhere:
|
|
.DS_Store
|
|
*.swp
|
|
*.tmp
|
|
|
|
# Project files that should not be in the repo
|
|
.project
|
|
.settings/
|
|
.settings.xml
|
|
.settings.xml.old
|
|
.*.gz
|
|
|
|
# A handy place to put stuff that git should ignore:
|
|
/ignore/
|
|
/build/
|