resolve editor conflicts

[ci skip]

app/assets/javascripts/repo/lib/editor_options.js

 export default [{
-<<<<<<< HEAD
   readOnly: model => !!model.file.file_lock,
-=======
->>>>>>> upstream/master
 }];

spec/javascripts/repo/lib/editor_options_spec.js

@@ -4,11 +4,8 @@ describe('Multi-file editor library editor options', () => {
   it('returns an array', () => {
     expect(editorOptions).toEqual(jasmine.any(Array));
   });
-<<<<<<< HEAD
 
   it('contains readOnly option', () => {
     expect(editorOptions[0].readOnly).toBeDefined();
   });
-=======
->>>>>>> upstream/master
 });

spec/javascripts/repo/lib/editor_spec.js

@@ -92,37 +92,6 @@ describe('Multi-file editor library', () => {
 
       expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith(model);
     });
-<<<<<<< HEAD
-
-    describe('updateOptions', () => {
-      it('defaults readOnly to false', () => {
-        spyOn(instance.instance, 'updateOptions');
-
-        instance.attachModel(model);
-
-        expect(instance.instance.updateOptions).toHaveBeenCalledWith({
-          readOnly: false,
-        });
-      });
-
-      it('puts editor into readOnly mode when file is locked', () => {
-        spyOn(instance.instance, 'updateOptions');
-
-        Object.assign(model.file, {
-          file_lock: {
-            name: 'test',
-          },
-        });
-
-        instance.attachModel(model);
-
-        expect(instance.instance.updateOptions).toHaveBeenCalledWith({
-          readOnly: true,
-        });
-      });
-    });
-=======
->>>>>>> upstream/master
   });
 
   describe('clearEditor', () => {