diff --git a/src/views/compilation/handbook/index.vue b/src/views/compilation/handbook/index.vue index 054fda7..9936c9f 100644 --- a/src/views/compilation/handbook/index.vue +++ b/src/views/compilation/handbook/index.vue @@ -6,22 +6,12 @@ -<<<<<<< HEAD -======= - - ->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68 -<<<<<<< HEAD -======= - ->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68 -<<<<<<< HEAD 查询 重置 -======= - 查询 - 重置 ->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68 @@ -85,11 +52,7 @@ > -<<<<<<< HEAD --> -======= - ->>>>>>> 920c391d958f28235c74f3f866465688cae9eb68