Resolve conflicts in mock_data.js

0f36cbdf · Grzegorz Bizon · b8f653f9 · 0f36cbdf
Commit 0f36cbdf authored Jul 16, 2018 by Grzegorz Bizon
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/javascripts/environments/mock_data.js spec/javascripts/environments/mock_data.js +0 -3

No files found.
--- a/spec/javascripts/environments/mock_data.js
+++ b/spec/javascripts/environments/mock_data.js
@@ -64,7 +64,6 @@ export const serverData = [
      environment_type: 'build',
      last_deployment: null,
      has_stop_action: false,
-<<<<<<< HEAD
      environment_path: '/root/review-app/environments/12',
      stop_path: '/root/review-app/environments/12/stop',
      created_at: '2017-02-01T19:42:18.400Z',
@@ -82,8 +81,6 @@ export const serverData = [
      environment_type: 'build',
      last_deployment: null,
      has_stop_action: false,
-=======
->>>>>>> upstream/master
      environment_path: '/root/review-app/environments/12',
      stop_path: '/root/review-app/environments/12/stop',
      created_at: '2017-02-01T19:42:18.400Z',