@@ -1,18 +1,5 @@
<!DOCTYPE html>
<html lang="en">
-<<<<<<< HEAD
-=======
- <head>
- <meta charset="UTF-8" />
- <link rel="icon" href="/logo_1.png" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>采销365结算</title>
- <script src="/sortable.min.js"></script>
- <script>
- window.process = {};
- </script>
- </head>
->>>>>>> sit
<head>
<meta charset="UTF-8" />
