Fixed merge problems.
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 18 Apr 2016 15:49:31 +0000 (17:49 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 18 Apr 2016 15:49:31 +0000 (17:49 +0200)
commit5bf618946050229146f7eb086dcc67365f1d47be
tree23c20242449b97f7f133e216c957a6f18f2de6b9
parentfed146dbb3d924fd67cf297956635e738318b7f4
Fixed merge problems.
src/emuvim/dcemulator/resourcemodel/upb/simple.py