add

miaomiao/www/templates/my/my-profile.html

@@ -1,13 +1,8 @@
 <ion-view view-title="个人信息" >
     <ion-content>
      <div class="list">
-<<<<<<< HEAD
-         <a class="item item-avatar-right" ng-click="reset()">
-             <img  src="../../img/demo/head5.jpg" />
-=======
          <a class="item item-avatar-right" ng-click="setAvator()">
              <img  src="img/demo/head5.jpg" />
->>>>>>> 1d310a3a45c853ca8f205ef89ee51539cd5ccf2a
              <h2>头像</h2>
              <p style="font-size:12px">点击上传</p>
          </a>