Bladeren bron

--解决合并冲突

zzy.zhiyuan.foxmail 8 jaren geleden
bovenliggende
commit
aa38ccdf1c
1 gewijzigde bestanden met toevoegingen van 0 en 4 verwijderingen
  1. 0 4
      needSure.html

+ 0 - 4
needSure.html

55
                </div>
55
                </div>
56
                <div class="dialoginfotype clearfix inline" style="margin-left:50px">
56
                <div class="dialoginfotype clearfix inline" style="margin-left:50px">
57
                	<span class="floatL" id="">需求目的:</span>
57
                	<span class="floatL" id="">需求目的:</span>
58
<<<<<<< HEAD
59
                	<span class="dialogtit floatL" id="dialt"></span>
60
=======
61
                	<span class="dialogtit floatL" id="demandt"></span>
58
                	<span class="dialogtit floatL" id="demandt"></span>
62
>>>>>>> refs/heads/dev
63
                </div>
59
                </div>
64
                <div class="dialoginfotype clearfix" id="dialog_consultContentContainer">
60
                <div class="dialoginfotype clearfix" id="dialog_consultContentContainer">
65
                	<div class="floatL" id="dialog_consultContentTitle">需求内容:</div>
61
                	<div class="floatL" id="dialog_consultContentTitle">需求内容:</div>