diff options
Diffstat (limited to 'spec/features/markdown/math_spec.rb')
| -rw-r--r-- | spec/features/markdown/math_spec.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/features/markdown/math_spec.rb b/spec/features/markdown/math_spec.rb index 310e6a7171d..16ad0d456be 100644 --- a/spec/features/markdown/math_spec.rb +++ b/spec/features/markdown/math_spec.rb @@ -1,11 +1,7 @@ require 'spec_helper' describe 'Math rendering', :js do -<<<<<<< HEAD let!(:project) { create(:project, :public) } -======= - let!(:project) { create(:project, :public) } ->>>>>>> dev/master it 'renders inline and display math correctly' do description = <<~MATH |