Remove merge conflict markers from server.mjs

GsCommand · GsCommand · commit 98f0ccb45c03 · 2026-02-22T21:50:30.000-05:00
diff --git a/server.mjs b/server.mjs
@@ -1396,10 +1396,6 @@ return res.json(receipt);
       }
 
       return res.status(500).json(receipt);
-<<<<<<< HEAD
- eed1802 (Runtime: signer env standardization + ENS verify smoke)
-=======
->>>>>>> ac7f281 (Remove stray git line from server.mjs)
 
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1396,10 +1396,6 @@ return res.json(receipt);`
`1396`	`1396`	`}`
`1397`	`1397`
`1398`	`1398`	`return res.status(500).json(receipt);`
`1399`		`-<<<<<<< HEAD`
`1400`		`- eed1802 (Runtime: signer env standardization + ENS verify smoke)`
`1401`		`-=======`
`1402`		`->>>>>>> ac7f281 (Remove stray git line from server.mjs)`
`1403`	`1399`
`1404`	`1400`	`}`
`1405`	`1401`	`}`