Skip to content

G
gitlab-ce
Commit 0f36cbdf authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files
Options

Resolve conflicts in mock_data.js

parent b8f653f9
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/javascripts/environments/mock_data.js
View file @ 0f36cbdf
...@@ -64,7 +64,6 @@ export const serverData = [ ...@@ -64,7 +64,6 @@ export const serverData = [
environment_type: 'build', environment_type: 'build',
last_deployment: null, last_deployment: null,
has_stop_action: false, has_stop_action: false,
<<<<<<< HEAD
environment_path: '/root/review-app/environments/12', environment_path: '/root/review-app/environments/12',
stop_path: '/root/review-app/environments/12/stop', stop_path: '/root/review-app/environments/12/stop',
created_at: '2017-02-01T19:42:18.400Z', created_at: '2017-02-01T19:42:18.400Z',
...@@ -82,8 +81,6 @@ export const serverData = [ ...@@ -82,8 +81,6 @@ export const serverData = [
environment_type: 'build', environment_type: 'build',
last_deployment: null, last_deployment: null,
has_stop_action: false, has_stop_action: false,
=======
>>>>>>> upstream/master
environment_path: '/root/review-app/environments/12', environment_path: '/root/review-app/environments/12',
stop_path: '/root/review-app/environments/12/stop', stop_path: '/root/review-app/environments/12/stop',
created_at: '2017-02-01T19:42:18.400Z', created_at: '2017-02-01T19:42:18.400Z',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7