删除冲突信息

src/app/my/my-setting-detail/my-setting-detail.component.html

@@ -55,15 +55,12 @@
 
 
   <div class="picItem introduction" *ngIf="this.uploadType=='introduction'">
   <div class="picItem introduction" *ngIf="this.uploadType=='introduction'">
     <div style="height: 30px;font-size: 20px;margin-bottom: 20px;">自我介绍</div>
     <div style="height: 30px;font-size: 20px;margin-bottom: 20px;">自我介绍</div>
-<<<<<<< HEAD
     <textarea class="form-control" rows="10" [(ngModel)]="settingInfo.bioIntro" placeholder="赶紧介绍一下你自己吧！"
     <textarea class="form-control" rows="10" [(ngModel)]="settingInfo.bioIntro" placeholder="赶紧介绍一下你自己吧！"
       maxlength="200" style="border: none;" (keydown)="controlWord($event)"></textarea>
       maxlength="200" style="border: none;" (keydown)="controlWord($event)"></textarea>
     <span class="maxWord">{{ 200- (settingInfo.bioIntro)?.length}}</span>
     <span class="maxWord">{{ 200- (settingInfo.bioIntro)?.length}}</span>
-=======
     <textarea class="form-control" name="bioInfo" rows="10" [(ngModel)]="settingInfo.bioIntroTwo" placeholder="赶紧介绍一下你自己吧！"
     <textarea class="form-control" name="bioInfo" rows="10" [(ngModel)]="settingInfo.bioIntroTwo" placeholder="赶紧介绍一下你自己吧！"
       maxlength="200" style="border: none;" (keydown)="controlWord($event)"></textarea>
       maxlength="200" style="border: none;" (keydown)="controlWord($event)"></textarea>
     <span class="maxWord">{{ 200- (settingInfo.bioIntroTwo)?.length}}</span>
     <span class="maxWord">{{ 200- (settingInfo.bioIntroTwo)?.length}}</span>
->>>>>>> dev
     <div class="saveBtn" (click)="mySettingSave()">确定</div>
     <div class="saveBtn" (click)="mySettingSave()">确定</div>
   </div>
   </div>