resolve file crash

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9208 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-09-20 01:32:50 +00:00
parent 73563f5042
commit 73d2127411

View file

@ -69,11 +69,7 @@ jQuery(function($){
<div id="suggestion3" class="tgContent suggestion" >
<ul></ul>
</div>
<<<<<<< .mine
</div>
=======
</p>
>>>>>>> .r9199
<p>
<select class="moduleList" style="width:290px"></select>
</p>