Resolve conflicts in app/assets/javascripts/diffs/store/actions.js

app/assets/javascripts/diffs/store/actions.js

@@ -147,13 +147,6 @@ export const scrollToLineIfNeededParallel = (_, line) => {
   }
 };
 
-<<<<<<< HEAD
-export const loadCollapsedDiff = ({ commit }, file) =>
-  axios.get(file.load_collapsed_diff_url).then(res => {
-    commit(types.ADD_COLLAPSED_DIFFS, {
-      file,
-      data: res.data,
-=======
 export const loadCollapsedDiff = ({ commit, getters }, file) =>
   axios
     .get(file.load_collapsed_diff_url, {
@@ -166,7 +159,6 @@ export const loadCollapsedDiff = ({ commit, getters }, file) =>
         file,
         data: res.data,
       });
->>>>>>> upstream/master
     });
 
 export const expandAllFiles = ({ commit }) => {