move global css

2025-01-28 08:40:49 +01:00 · 2025-01-28 08:40:49 +01:00 · 7cc724e05b
parent c0963994d2
commit 7cc724e05b
1 changed files with 0 additions and 12 deletions
--- a/vue-project/src/components/List.vue
+++ b/vue-project/src/components/List.vue
@ -18,16 +18,4 @@
 </script>

 <style lang="css">
-<<<<<<< HEAD
-.list {
-  padding: 1em;
-  background-color: cadetblue;
-}
-
-table {
-  border-collapse: collapse;
-}
-=======
->>>>>>> 7fee405... move global css
-
 </style>