mqzheng/Table
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

delect conflict

Browse Source
This commit is contained in:
郑茂强 2018-08-23 11:21:17 +08:00
parent 306abb9b37
commit 09536474bd
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/index.html
View File

@ -1,29 +1,20 @@
<!DOCTYPE html> <!DOCTYPE html>
<<<<<<< HEAD
<html>
=======
<html lang="en"> <html lang="en">
>>>>>>> dev-mq
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<<<<<<< HEAD
<title>web-gantt</title>
</head>
<body>
<noscript>
<strong>We're sorry but web-gantt doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
=======
<title>table_dropdown</title> <title>table_dropdown</title>
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but table_dropdown doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but table_dropdown doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
>>>>>>> dev-mq
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
</html> </html>