@@ -6,13 +6,6 @@ div ng-if="item.t__type == 1">
<input type="text" ng-model="item.text" placeholder="{{note}}" style="background-colro:black;colro:red">
<p>this is a new world</p>
-<<<<<<< .mine
-
-=======
->>>>>>> .theirs
</label>
</div>