fix merge conflicts

abhishek9686 · abhishek9686 · commit f44c37e3aa05 · 2025-06-24T17:00:10.000+05:30
diff --git a/migrate/migrate.go b/migrate/migrate.go
@@ -65,7 +65,7 @@ func resync() {
 			}
 			if node.RelayedBy != "" {
 				// check if node exists
-				_, err := logic.GetNodeByID(node.ID.String())
+				_, err := logic.GetNodeByID(node.RelayedBy)
 				if err != nil {
 					node.RelayedBy = ""
 					node.InternetGwID = ""

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func resync() {`
`65`	`65`	`}`
`66`	`66`	`if node.RelayedBy != "" {`
`67`	`67`	`// check if node exists`
`68`		`- _, err := logic.GetNodeByID(node.ID.String())`
	`68`	`+ _, err := logic.GetNodeByID(node.RelayedBy)`
`69`	`69`	`if err != nil {`
`70`	`70`	`node.RelayedBy = ""`
`71`	`71`	`node.InternetGwID = ""`