Browse Source

解决冲突问题

lyn7568 5 years ago
parent
commit
a1d7d7077b
1 changed files with 0 additions and 6 deletions
  1. 0 6
      e/search.html

+ 0 - 6
e/search.html

1
<!DOCTYPE html>
1
<!DOCTYPE html>
2
<html style="max-width: 640px;margin: auto;">
2
<html style="max-width: 640px;margin: auto;">
3

4
<head>
3
<head>
5
<meta charset="UTF-8">
4
<meta charset="UTF-8">
6
<title>搜索-科袖网</title>
5
<title>搜索-科袖网</title>
36
</script>
35
</script>
37

36

38
</head>
37
</head>
39
<<<<<<< HEAD
40
=======
41
<!-- 1111 -->
42
>>>>>>> dev
43
<!-- 111 -->
44
<body>
38
<body>
45
<div class="bomb-box"></div>
39
<div class="bomb-box"></div>
46
<div class="contentBody2" id="page">
40
<div class="contentBody2" id="page">