f53632b00d
Conflicts: .gitignore public_html/gmap.html public_html/script.js All conflicts fixed but you are still merging. modified: .gitignore modified: dump1090.c new file: public_html/config.js new file: public_html/coolclock/coolclock.js new file: public_html/coolclock/excanvas.js new file: public_html/coolclock/moreskins.js new file: public_html/extension.js modified: public_html/gmap.html new file: public_html/options.js new file: public_html/planeObject.js modified: public_html/script.js modified: public_html/style.css
10 lines
96 B
Plaintext
10 lines
96 B
Plaintext
*.o
|
|
dump1090
|
|
testfiles/*.bin
|
|
misc
|
|
frames.js
|
|
.*.swp
|
|
*~
|
|
*.rej
|
|
*.orig
|
|
untrackedDeveloperSettings.js |