修改合并错误

ec257716 · stylefeng · 7fecbb27 · ec257716
Commit ec257716 authored Jan 31, 2018 by stylefeng
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

guns-admin/src/main/webapp/static/modular/system/notice/notice_info.js
+0 -1

No files found.
--- a/guns-admin/src/main/webapp/static/modular/system/notice/notice_info.js
+++ b/guns-admin/src/main/webapp/static/modular/system/notice/notice_info.js
@@ -123,6 +123,5 @@ $(function () {
    var editor = new E('#editor');
    editor.create();
    editor.txt.html($("#contentVal").val());
-    editor.txt
    NoticeInfoDlg.editor = editor;
 });