Commit a2eb44e1 authored by eduardmisa's avatar eduardmisa

fixed conflict

parent a966fed8
...@@ -17,7 +17,7 @@ import json ...@@ -17,7 +17,7 @@ import json
REALTIMESERVER_IP = settings.REALTIMESERVER_IP REALTIMESERVER_IP = settings.REALTIMESERVER_IP
def from app.applicationlayer.utils import model_to_dict(instance): def model_to_dict(instance):
try: try:
mySerializer = copy.deepcopy(DynamicSerializer) mySerializer = copy.deepcopy(DynamicSerializer)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment