Merge remote-tracking branch 'origin/master'

# Conflicts: # .gitignore # README.md # parker/models.py # parker/settings.default.py
zucler · Oct 6, 2016 · 9f3b9ca · 9f3b9ca
2 parents 46dfc72 + 4685735
commit 9f3b9ca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Create a new file _parker/settings.py_.
 
 Copy the contents from _parker/settings.default.py_ into the new file.
 
-Update the settings:
+Update the settings in new file to match your setup:
 
 ```
 #Set your DB connection details below:

diff --git a/parker/models.py b/parker/models.py
@@ -32,7 +32,6 @@ class RateType(models.Model):
     """
     parkingID = models.ForeignKey(Parking, on_delete=models.CASCADE, db_column='parkingID')
     rateID = models.AutoField(primary_key=True, unique=True)
-
     day_of_week = models.SmallIntegerField(default=0)
     start_time = models.TimeField(default=time(0, 0, 0))
     end_time = models.TimeField(default=time(0, 0, 0))