Resolve conflict in app/assets/javascripts/environments/stores/environments_store.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/assets/javascripts/environments/stores/environments_store.js
Signed-off-by: Rémy Coutable <remy@rymai.me>
bab361d8 · Rémy Coutable · 9613f1d7 · bab361d8
Commit bab361d8 authored Nov 23, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

app/assets/javascripts/environments/stores/environments_store.js ...ets/javascripts/environments/stores/environments_store.js +0 -9

No files found.
--- a/app/assets/javascripts/environments/stores/environments_store.js
+++ b/app/assets/javascripts/environments/stores/environments_store.js
@@ -44,21 +44,12 @@ export default class EnvironmentsStore {
  storeEnvironments(environments = []) {
    const filteredEnvironments = environments.map((env) => {
      const oldEnvironmentState = this.state.environments
-<<<<<<< HEAD
-      .find((element) => {
-        if (env.latest) {
-          return element.id === env.latest.id;
-        }
-        return element.id === env.id;
-      }) || {};
-=======
        .find((element) => {
          if (env.latest) {
            return element.id === env.latest.id;
          }
          return element.id === env.id;
        }) || {};
->>>>>>> origin/master

      let filtered = {};