Fix merge conflict

canteeneo/api.py

@@ -237,7 +237,7 @@ def dish_obj(dish):
 def stall_obj(stall):
     if stall is None:
         return None
-    return {
+    return {git d
         'id': stall.id,
         'name': stall.name,
         'description': stall.description,