cxc/yshop-pro-vue3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决代码冲突

Browse Source
This commit is contained in:
黄少君
2023-11-14 17:57:33 +08:00
parent 3b2609e9a6
commit 12742d345f
231 changed files with 180 additions and 143121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
public/UEditor22/dialogs/template/template.html
View File

@ -1,31 +1,3 @@
<<<<<<< HEAD
<!DOCTYPE HTML>
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<script type="text/javascript" src="../internal.js"></script>
<link rel="stylesheet" type="text/css" href="template.css">
</head>
<body>
<div class="wrap">
<div class="left">
<div class="top">
<label><var id="lang_template_clear"></var>：<input id="issave" type="checkbox"></label>
</div>
<div class="bottom border_style1" id="preview"></div>
</div>
<fieldset class="right border_style1">
<legend><var id="lang_template_select"></var></legend>
<div class="pre" id="preitem"></div>
</fieldset>
<div class="clear"></div>
</div>
<script type="text/javascript" src="config.js"></script>
<script type="text/javascript" src="template.js"></script>
</body>
</html>
=======
<!DOCTYPE HTML>
<html>
<head>
@ -52,4 +24,3 @@
<script type="text/javascript" src="template.js"></script>
</body>
</html>
>>>>>>> master