Merge branch 'master' into Screening_History_Feature

CS2113-AY1819S1-F10-3 · Oct 16, 2018 · 224c9dc · 224c9dc
2 parents 09a1851 + 7bab73b
commit 224c9dc
Show file tree

Hide file tree

Showing 11 changed files with 409 additions and 138 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,11 @@
 *.class
 
 # Default data file
-policeRecords.txt
 notification.txt
+policeRecords.txt
 passwordStorage.txt
 
 # Logger files
-parserLog.log
 
 # Package Files #
 *.jar

diff --git a/README.adoc b/README.adoc
@@ -32,7 +32,7 @@ The full list of contributors for Police Records System can be found link:docs/A
 
 == Acknowledgements
 
-The original source of the code is https://github.com/nusCS2113-AY1819S1/addressbook-level3/[AddressBook-Level-4] project created by the SE-EDU initiative.
+The original source of the code is https://github.com/nusCS2113-AY1819S1/addressbook-level3/[AddressBook-Level-3] project created by the SE-EDU initiative.
 
 Listening to users and their pain points allowed us to develop this application that solved the problems faced by police officers and headquarter personnel.