Merge conflict resolution

IHTSDO · Mar 27, 2019 · 12775eb · 12775eb
1 parent 5ab3ed6
commit 12775eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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"