Fixing conflicts

Anshul Mittal · Anshul Mittal · commit 4a2dcd21360a · 2022-03-19T22:28:06.000+05:30
diff --git a/xc/libs/model.py b/xc/libs/model.py
@@ -1 +1 @@
-from xc.method.mufin.model import *
+from xc.method.mufin.model import *
diff --git a/xc/models/network.py b/xc/models/network.py
@@ -1 +1 @@
-from xc.method.mufin.network import *
+from xc.method.mufin.network import *

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from xc.method.mufin.model import *`
	`1`	`+from xc.method.mufin.model import *`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from xc.method.mufin.network import *`
	`1`	`+from xc.method.mufin.network import *`