From 2f1fbeef7fbf16b2f78e1a63e3ccf1aee707a90c Mon Sep 17 00:00:00 2001
From: saschrad <saschrad@stud.ntnu.no>
Date: Wed, 27 Apr 2022 09:32:59 +0200
Subject: [PATCH] Merge

---
 src/components/NewPasswordForm.vue | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/components/NewPasswordForm.vue b/src/components/NewPasswordForm.vue
index a8503f8..bff1248 100644
--- a/src/components/NewPasswordForm.vue
+++ b/src/components/NewPasswordForm.vue
@@ -107,26 +107,13 @@ export default {
         rePassword: "",
       },
 
-<<<<<<< HEAD
-      valid: true,
-      rules: {
-        required: (value) => !!value || "Feltet er påkrevd",
-        min: (v) => v.length >= 8 || "Minimum 8 tegn",
-        passwordConfirmation: (v) =>
-          v === this.user.password || "Passordene må være like",
-      },
-=======
       showError: false,
->>>>>>> main
     };
   },
   computed: mapState({
     token: (state) => state.user.token,
   }),
   methods: {
-<<<<<<< HEAD
-    async setNewPassword() {},
-=======
     async setNewPassword() {
       this.showError = true;
 
@@ -153,7 +140,6 @@ export default {
         console.log("Something went wrong");
       }
     },
->>>>>>> main
     validate() {
       this.$refs.form.validate();
     },
-- 
GitLab