Fix merge

Author: ArayB

src/events/cd-event-form.vue

@@ -256,14 +256,14 @@
               city: this.city,
               address: this.address,
               dates: [{ startTime: this.startTime, endTime: this.endTime }],
-              // type: 'one-off',
+              type: 'one-off',
               status: 'published',
               public: this.public,
               useDojoAddress: false,
               ticketApproval: false,
               notifyOnApplicant: false,
-              // country: this.dojo.country,
-              // sessions: this.sessions,
+              country: this.dojo.country,
+              sessions: this.sessions,
               dojoId: this.dojo.id,
             });
 

test/unit/specs/dojos/manage-request-to-join.spec.js

@@ -15,7 +15,7 @@ describe('Manage request to join component', () => {
       },
     };
     UsersService = {
-      userProfileData: sandbox.stub(),
+      userProfileData: sinon.stub(),
     };
     vm = vueUnitHelper(cdManageRequestToJoin({
       '@/dojos/service': DojosService,
@@ -165,16 +165,8 @@ describe('Manage request to join component', () => {
         err.status = 400;
         DojosService.membership.accept.rejects(err);
         vm.membershipRequest = {};
-<<<<<<< HEAD
-<<<<<<< HEAD
-        vm.onError = sandbox.stub();
-        vm.loadConflictingUser = sandbox.stub().resolves();
-=======
+        vm.loadConflictingUser = sinon.stub().resolves();
         vm.onError = sinon.stub();
->>>>>>> Add unit tests for event form
-=======
-        vm.onError = sinon.stub();
->>>>>>> fff3af7f33812ddbc1922f3173da485aa86cc325
         vm.status = 'accept';
         await vm.actOnMembershipRequest();
         expect(DojosService.membership.accept).to.have.been.calledOnce;