|
|
@@ -77,15 +77,9 @@
|
|
|
</table>
|
|
|
</form>
|
|
|
<div>
|
|
|
-<<<<<<< HEAD
|
|
|
- <!-- style="position: absolute;min-width:1650px;min-height:900px;" -->
|
|
|
- <iframe
|
|
|
- src="" noresize="noresize" frameborder="0" id="mainframe"></iframe>
|
|
|
-=======
|
|
|
<iframe
|
|
|
src="" width="100%" height="100%"
|
|
|
scrolling="no" id="Iframe" frameborder="0"></iframe>
|
|
|
->>>>>>> 863592fcd6e1ae3de37cc58581e025a7808cad18
|
|
|
</div>
|
|
|
</div>
|
|
|
<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
|
