From 815231fec9442672ad638398393ba506c7169fd4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 1 Dec 2023 08:23:06 -0300
Subject: [PATCH] resolve conflict

---
 src/components/ui/{CardList2.vue => CardList.vue} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/components/ui/{CardList2.vue => CardList.vue} (100%)

diff --git a/src/components/ui/CardList2.vue b/src/components/ui/CardList.vue
similarity index 100%
rename from src/components/ui/CardList2.vue
rename to src/components/ui/CardList.vue