From fa06f3e4e658bda108b6fbd4c8e0c8ab39284ba4 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Tue, 2 Jun 2015 15:58:15 -0700
Subject: [PATCH] fixed merge conflict.

---
 src/compiler/diagnosticMessages.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index d4595d4cd28..8f3973fbdb8 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -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