solve merge comflict

ZTL-UwU · ZTL-UwU · commit 4886239b294b · 2020-08-13T11:09:59.000+08:00
Signed-off-by: zhangtianli2006 &lt;49156174+zhangtianli2006@users.noreply.github.com&gt;
diff --git a/src/components/lib/tag.vue b/src/components/lib/tag.vue
@@ -64,4 +64,4 @@ export default {
     white-space: nowrap;
     margin: 3px;
 }
-</style>
+</style>
