Attempt to resolve github file conflict

gratipay · Mar 17, 2017 · 9445dda · 9445dda
1 parent 54f70d1
commit 9445dda
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/gratipay/utils/fake_data.py b/gratipay/utils/fake_data.py
@@ -220,6 +220,8 @@ def fake_payment(db, participant, team, timestamp, amount, payday, direction):
 
 
 def fake_exchange(db, participant, amount, fee, timestamp):
+    """Create a fake exchange for a participant
+    """
     route=get_exchange_route(db, participant.id)
     ref = '%s-%s-%s' % (participant.username, route, timestamp.microsecond)
     return insert_fake_data( db