Commits

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