|
@@ -9,18 +9,11 @@
|
|
|
<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
|
|
|
<meta http-equiv="x-ua-compatible" content="ie=edge">
|
|
|
<title>科技服务</title>
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
<!--<link rel="stylesheet" href="../src/css/bootstrap.css" />
|
|
|
<link rel="stylesheet" href="../src/css/public.css" />
|
|
|
<link rel="stylesheet" href="../src/css/main_banner.css" />
|
|
|
<link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
|
|
|
-=======
|
|
|
- <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />-->
|
|
|
- <!--<link rel="stylesheet" href="../src/css/public.css" />-->
|
|
|
- <!--<link rel="stylesheet" href="../src/css/main_banner.css" />-->
|
|
|
- <!--<link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
|
|
|
->>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
|
|
|
-
|
|
|
</head>
|
|
|
<body>
|
|
|
<header>
|
|
@@ -404,17 +397,11 @@
|
|
|
<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
|
|
|
</body>
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
|
|
|
<script type="text/javascript" src="../src/js/Technologytrading.js"></script>
|
|
|
<script type="text/javascript" src="../src/js/public.js"></script>
|
|
|
<script type="text/javascript" src="../src/js/main_banner.js" ></script>-->
|
|
|
-=======
|
|
|
-<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>-->
|
|
|
-<!--<script type="text/javascript" src="../src/js/Technologytrading.js"></script>-->
|
|
|
-<!--<script type="text/javascript" src="../src/js/public.js"></script>-->
|
|
|
-<!--<script type="text/javascript" src="../src/js/main_banner.js" ></script>-->
|
|
|
->>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
|
|
|
|
|
|
|
|
|
</html>
|