Remove merge conflict marker (#12916)

2026-04-01 09:01:45 +08:00 · 2016-11-25 08:28:20 -05:00
parent dc6cc8dcb9
commit a5be925ae1
1 changed files with 0 additions and 1 deletions
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -70,7 +70,6 @@
            "typingsPackageName": "simplesignal",
            "sourceRepoURL": "https://github.com/zeh/simplesignal",
            "asOfVersion": "1.0.0"
->>>>>>> types-2.0
        }
    ]
 }