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

35
public/UEditor/dialogs/table/edittip.html
View File

@ -1,37 +1,3 @@
<<<<<<< HEAD
<!DOCTYPE html>
<html>
<head>
<title>表格删除提示</title>
<script type="text/javascript" src="../internal.js"></script>
<style type="text/css">
.section {
width: 200px;
margin: 10px auto 0;
font-size: 14px;
}
.item {
text-align: center;
}
</style>
</head>
<body>
<div class="section">
<div class="item">
<label><input type="radio" id="J_delRow" name="cmd" checked/><var id="lang_delRow"></var></label>
</div>
<div class="item">
<label><input type="radio" id="J_delCol" name="cmd"/><var id="lang_delCol"></var></label>
</div>
</div>
<script type="text/javascript">
dialog.onok = function () {
$G("J_delRow").checked ? editor.execCommand("deleterow") : editor.execCommand("deletecol");
};
</script>
</body>
=======
<!DOCTYPE html>
<html>
<head>
@ -64,5 +30,4 @@
};
</script>
</body>
>>>>>>> master
</html>