diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 16:11:03 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 16:11:03 +0000 |
| commit | 374387b5b4fbb8b8c1aa0bbc7d307390bbd3ecf7 (patch) | |
| tree | c927a4ee7cf4de67d1e9175b609e22f213ea8eff /spec/javascripts | |
| parent | 2159694e5024a129ef77f7b81af4fadcde84334a (diff) | |
| parent | 98e6e3062d4a69b4ed22dcffbb869b26d28fd573 (diff) | |
| download | gitlab-ce-374387b5b4fbb8b8c1aa0bbc7d307390bbd3ecf7.tar.gz | |
Resolve conflict after merge
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/fixtures/environments/table.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/environments/table.html.haml b/spec/javascripts/fixtures/environments/table.html.haml index 1ea1725c561..59edc0396d2 100644 --- a/spec/javascripts/fixtures/environments/table.html.haml +++ b/spec/javascripts/fixtures/environments/table.html.haml @@ -3,7 +3,7 @@ %tr %th Environment %th Last deployment - %th Build + %th Job %th Commit %th %th |