Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202

2016-09-24 14:54:59 +12:00
parent f3ab8dfe14 dbc5ed1080
commit 8d55e7dbca
1 changed files with 3 additions and 0 deletions
@@ -16,6 +16,9 @@ Run java -jar seng202_2016_team9_phase2.jar
 Necessary Files:
 /res/userdb.db

+To not have userdb.db clash problems run:
+git update-index --assume-unchanged res/userdb.db
+
 Getting started:
 The application is shipped with all the example data files pre loaded into the database. If the user wants add more data
 from a file then they can select a file to import using File -> Import <data> where data is the type of data you are