From 12775ebe6e0f6a216624ca7da67444d63e3d2209 Mon Sep 17 00:00:00 2001
From: Chris Swires <csw@ihtsdo.org>
Date: Wed, 27 Mar 2019 11:44:23 +0000
Subject: [PATCH] Merge conflict resolution

---
 app/shared/concept-edit/axiomTemplate.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/shared/concept-edit/axiomTemplate.html b/app/shared/concept-edit/axiomTemplate.html
index 7792f6d8a..95691cbaf 100644
--- a/app/shared/concept-edit/axiomTemplate.html
+++ b/app/shared/concept-edit/axiomTemplate.html
@@ -88,9 +88,9 @@
             <div class="pull-left is_a is_a_bg"
                  drag-enter-class="sca-drag-target"
                  drag-hover-class="sca-drag-hover"
-                 drop-channel="completeConcept"`
-                 ui-on-drop="dropAxiomRelationshipType(relationship, $data, axiom.type)"``
-                 drop-validate="!isLockedModule(axiom.moduleId) && !isStatic">`
+                 drop-channel="completeConcept"
+                 ui-on-drop="dropAxiomRelationshipType(relationship, $data, axiom.type)"
+                 drop-validate="!isLockedModule(axiom.moduleId) && !isStatic">
 
                 <textarea id="axiom-relationship-type-id-{{concept.conceptId}}-{{relationship.groupId}}-{{$index}}"
                           custom-autofocus="true" autofocus ng-keyup="enterListener({event: $event})" type="text" ng-model="relationship.type.fsn"