fix merging

trombi/models.py

@@ -117,12 +117,12 @@ class TrombiUser(models.Model):
             else:
                 end_date = ""
             TrombiClubMembership(
-                    user=self,
-                    club=str(m.club),
-                    role=role[:64],
-                    start=get_semester(m.start_date),
-                    end=end_date,
-                    ).save()
+                user=self,
+                club=str(m.club),
+                role=role[:64],
+                start=get_semester(m.start_date),
+                end=end_date,
+            ).save()
 
 
 class TrombiComment(models.Model):
@@ -140,6 +140,7 @@ class TrombiComment(models.Model):
             return False
         return user.id == self.author.user.id or user.can_edit(self.author.trombi)
 
+
 class TrombiClubMembership(models.Model):
     """
     This represent a membership to a club