jodoherty avatar jodoherty committed 322e0fe Merge with conflicts

Merge branch 'master' of https://bitbucket.org/jodoherty/mmlshare_backup

Conflicts:
.gitignore

Comments (0)

Files changed (2)

 bin
 autostart.cgi
 pid
+<<<<<<< HEAD
 data.py
+=======
+>>>>>>> a97ab8b599c6917b4524aefd4b054608842ed5ca
 data
 static/nsf
-#!/usr/bin/env python2.7
+#!/usr/bin/env python2.6
 
 import tools
 import config
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.