resolve conflicts

AmyangXYZ · Dec 27, 2023 · 85a4961 · 85a4961
1 parent 349ed44
commit 85a4961
Show file tree

Hide file tree

Showing 10 changed files with 263 additions and 250 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/PacketSniffer.vue b/src/components/PacketSniffer.vue
@@ -158,5 +158,4 @@ Row.inheritAttrs = false
   text-align: center;
 }
 </style>
-@/networks/TSCH
-@/networks/common
+@/networks/TSCH @/networks/common