fixes merge conflict.

formkit · Jan 16, 2024 · 4daeeba · 4daeeba
1 parent 33b73cc
commit 4daeeba
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/docs/pages/playground.vue b/docs/pages/playground.vue
@@ -14,7 +14,6 @@ let dropZone2 = ref(null);
 let firstListValues = ref(["Apple", "Banana", "Orange"]);
 let secondListValues = ref(["Pear", "Peach", "Grape"]);
 
-<<<<<<< HEAD
 let showList1 = ref(true);
 
 setTimeout(() => {
@@ -45,14 +44,6 @@ onMounted(() => {
     },
     plugins: [dropZone({})],
   });
-=======
-dragAndDrop({
-  parent: firstList,
-  values: firstListValues,
-  draggable: (child: HTMLElement) => {
-    return child.classList.contains("item");
-  },
->>>>>>> main
 });
 
 const testValues1 = computed(() => {