Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/08_PTRN/Testat/BankAccount.cpp
#	src/08_PTRN/Testat/BankAccount.h
#	src/08_PTRN/Testat/main.cpp
This commit is contained in:
Johannes Theiner 2018-12-11 11:28:54 +01:00
commit ca86c2e3ca
1 changed files with 0 additions and 1 deletions

View File

@ -3,7 +3,6 @@
#include "Cash.h" #include "Cash.h"
Cash::Cash(int value, Currency currency) : Money(value, currency) { Cash::Cash(int value, Currency currency) : Money(value, currency) {
} }