xinde11/testone.txt

div ng-if="item.t__type == 1">
    <div class="item item-divider"></div>
    <div class="item item-input">
        <span>{{item.name}}</span>
        <label class="input-margin">
     <input type="text" ng-model="item.text" placeholder="{{note}}" style="background-colro:black;colro:red">
        <p>this is a new world</p>
            <input type="text" ng-model="item.text" placeholder="{{note}}" style="background-colro:black;colro:red">
<<<<<<< .mine
    

=======
     

>>>>>>> .theirs
        </label>
    </div>
</div>