fixed a merge conflit problem

client/item/src/tags/item-tags.html

@@ -5,7 +5,6 @@
 <form name="form" ng-submit="$ctrl.submit()">
     <vn-card>
         <vn-vertical pad-large>
-<<<<<<< HEAD
             <vn-one margin-medium-top>
                 <vn-title>Item tags</vn-title>
                 <mg-ajax path="/item/api/Tags" options="mgIndex as tags"></mg-ajax>
@@ -46,38 +45,6 @@
                         </vn-icon>  
                     </vn-one>
                 </vn-horizontal>
-=======
-            <vn-title>Item tags</vn-title>
-            <mg-ajax path="/item/api/Tags" options="mgIndex as tags"></mg-ajax>
-            <vn-horizontal ng-repeat="itemTag in $ctrl.itemTags track by $index">
-                <vn-autocomplete
-                    vn-one
-                    initial-data = "itemTag.tag"
-                    field = "itemTag.tagFk"
-                    data = "tags.model"
-                    show-field = "name"
-                    label = "Tag">
-                </vn-autocomplete>
-                <vn-textfield vn-three label="Value" model="itemTag.value"></vn-textfield>
-                <vn-textfield vn-one type="number" label="Priority" model="itemTag.priority"></vn-textfield>
-                <vn-one pad-medium-top>
-                    <vn-icon
-                        pointer 
-                        medium-grey
-                        icon="remove_circle_outline"
-                        ng-click="$ctrl.removeItemTag($index)">
-                    </vn-icon>
-                    <vn-icon
-                        pointer 
-                        margin-medium-left
-                        orange
-                        icon="add_circle"
-                        ng-if = "itemTag.showAddIcon && tags.model.length > $ctrl.itemTags.length" 
-                        ng-click="$ctrl.addItemTag()">
-                    </vn-icon>  
-                </vn-one>
-            </vn-horizontal>
->>>>>>> 688881fac41a4018ebf187fc3b71e2030220853d
         </vn-vertical>
     </vn-card>
     <vn-button-bar>