Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

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

@@ -18,15 +18,10 @@
              <span class="input-label">
                  性别
              </span>
-<<<<<<< HEAD
              <select name="sex" ng-model="vm.sex">
                  <option value="0">男</option>
                  <option value="1">女</option>
-=======
-             <select name="sex" ng-model="vm.sex+''">
-                 <option value="1">男</option>
-                 <option value="2">女</option>
->>>>>>> 3e0c5c4a13e68478596981defab0f2f6b69d648b
+
              </select>
          </label>
          <label class="item item-input ">
@@ -37,11 +32,7 @@
              <span class="input-label">
                  情感状态
              </span>
-<<<<<<< HEAD
-             <select name="emotion" ng-model="vm.emotion">
-=======
              <select name="emotion" ng-model="vm.emotion+''">
->>>>>>> 3e0c5c4a13e68478596981defab0f2f6b69d648b
                  <option value="1">未婚</option>
                  <option value="2">已婚</option>
                  <option value="3">离异</option>