We need that branch to test FF after merge

c043e233 · Lin Jen-Shin · 4d28a691 · c043e233
Commit c043e233 authored Jun 27, 2016 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

spec/support/test_env.rb spec/support/test_env.rb +1 -0

No files found.
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -11,6 +11,7 @@ module TestEnv
    'feature_conflict' => 'bb5206f',
    'fix'              => '48f0be4',
    'improve/awesome'  => '5937ac0',
+    'merged-target'    => '21751bf',
    'markdown'         => '0ed8c6c',
    'lfs'              => 'be93687',
    'master'           => '5937ac0',