# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
# new file: mercantile/.models.py.swp
# new file: mercantile/__init__.py
# new file: mercantile/admin.py
# new file: mercantile/migrations/__init__.py
# new file: mercantile/models.py
# new file: mercantile/tests.py
# new file: mercantile/views.py
# modified: waffles/models.py
#
# Changes not staged for commit:
# modified: .gitignore
#
Create a new app, mercantile, which takes care of everything related to
money and calculations. Add classes and variables to the models of
both waffles and mercantile.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
# new file: mercantile/.models.py.swp
# new file: mercantile/__init__.py
# new file: mercantile/admin.py
# new file: mercantile/migrations/__init__.py
# new file: mercantile/models.py
# new file: mercantile/tests.py
# new file: mercantile/views.py
# modified: waffles/models.py
#
# Changes not staged for commit:
# modified: .gitignore
#
Christoffer Viken
Ilse Gerda Visser
Simon Glisic Randby
Yorin Anne De Jong