diff options
Diffstat (limited to 'spec/support/helpers/test_env.rb')
| -rw-r--r-- | spec/support/helpers/test_env.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index c58353558df..f6e90d8b3cc 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -43,7 +43,7 @@ module TestEnv 'video' => '8879059', 'crlf-diff' => '5938907', 'conflict-start' => '824be60', - 'conflict-resolvable' => '1450cd6', + 'conflict-resolvable' => '1450cd639e0bc6721eb02800169e464f212cde06', 'conflict-binary-file' => '259a6fb', 'conflict-contains-conflict-markers' => '78a3086', 'conflict-missing-side' => 'eb227b3', |