Updated everything to develop

GEWIS · Dec 24, 2023 · 44f7cab · 44f7cab
2 parents 812a93e + ebebcec
commit 44f7cab
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
@@ -43,6 +43,7 @@ const getUserMutations = async (take: number, skip: number) :
 
 <style scoped lang="scss">
 <<<<<<< HEAD
+<<<<<<< HEAD
 @import '../styles/BasePage.css';
 
 .balance-component {
@@ -51,4 +52,7 @@ const getUserMutations = async (take: number, skip: number) :
 =======
 @import "../styles/BasePage.css";
 >>>>>>> 8ca1d52 (Fixed HomeView.vue en App.vue to use primeflex)
+=======
+@import "../styles/BasePage.css";
+>>>>>>> ebebcec39984fc34626b1045c9aa3a239b72b534
 </style>