Resolve "Redigere bruker"

Closes #13 (closed)

client/src/app/users/user-profile-edit-form/user-profile-edit-form.component.spec.ts

@@ -18,6 +18,10 @@ describe('UserProfileEditFormComponent', () => {
   beforeEach(async () => {
     // UserService mock setup
     mockUserService = jasmine.createSpyObj(['updateUser']);
+<<<<<<< HEAD
+=======
+   
+>>>>>>> a9bf92d (Test: added tests for update user (#13))
     mockUserService.updateUser.and.returnValue(
       new Promise<string>(
         (resolve) => {
@@ -30,11 +34,19 @@ describe('UserProfileEditFormComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [ UserProfileEditFormComponent ],
+<<<<<<< HEAD
       imports: [ 
         HttpClientTestingModule, 
         FormsModule, 
         SharedModule,
         RouterTestingModule.withRoutes([
+=======
+    imports: [ 
+      HttpClientTestingModule, 
+      FormsModule, 
+      SharedModule,
+      RouterTestingModule.withRoutes([
+>>>>>>> a9bf92d (Test: added tests for update user (#13))
         { path: 'profil', component: UserProfileComponent}
       ])
     ],