fixed merge conflict.

2025-11-18 17:21:48 +00:00 · 2015-06-02 15:58:15 -07:00
parent 0917582a01
commit fa06f3e4e6
1 changed files with 0 additions and 4 deletions
@@ -1476,7 +1476,6 @@
        "category": "Error",
        "code": 2505
    },
-<<<<<<< HEAD
    "A non-ambient class cannot be merged with an interface.": {
        "category": "Error",
        "code": 2506
@@ -1485,9 +1484,6 @@
        "category": "Error",
        "code": 2507
    },
-=======
-
->>>>>>> master
    "Import declaration '{0}' is using private name '{1}'.": {
        "category": "Error",
        "code": 4000