diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 12:59:07 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 12:59:07 +0200 |
| commit | 452c076a34cc11cc97f4b1c3113e86ce4367e055 (patch) | |
| tree | a503b33dc6dd181e2cf56d5965fc1eb822b4d9f9 /spec/support | |
| parent | 13e37a3ee5c943525a99481b855d654e97e8597c (diff) | |
| download | gitlab-ce-452c076a34cc11cc97f4b1c3113e86ce4367e055.tar.gz | |
Revert "squashed merge and fixed conflicts"
This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/test_env.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 498bd4bf800..71664bb192e 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -16,7 +16,6 @@ module TestEnv 'master' => '5937ac0', "'test'" => 'e56497b', 'orphaned-branch' => '45127a9', - 'binary-encoding' => '7b1cf43', } # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |