--解决合并冲突

myDemand.html

@@ -74,7 +74,7 @@
						</div>
						<div class="labelarea">
                        	<ul class="labelshow chooseBox clearfix" id="labelshow">
					       		<!--<li class="deleteSubject"><em>66666</em><span class="removeNu"><img src="images/move.png"></span></li>
					       		<!--<li class="deleteSubject"><em>66666</em><span class="removeNu"><img src="images/move.png"></span></li>
					       		<li class="deleteSubject"><em>66666</em><span class="removeNu"><img src="images/move.png"></span></li>-->
					       	</ul>
                        </div>
@@ -147,13 +147,9 @@
             
            <div class="workselectcon" id="wode">
                <div id="workContainer2">
<<<<<<< HEAD
                	<div id="myNeed"></div>
=======
                	<div id="myNeed">
                		
                	</div>
>>>>>>> refs/heads/dev
                </div>
                <div class="tcdPageCode getReplyPage"></div>
            </div>