diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:38:42 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:38:42 -0800 |
| commit | a93c5bbcb3c6ebec1937c01e17c8f0f58e65dda6 (patch) | |
| tree | b11e5653b6de8e5108c6ae4a18b0a454e5364ac8 | |
| parent | 43d7fb13890be0c840b8901191617fdc90edcf9e (diff) | |
| download | gitlab-ce-a93c5bbcb3c6ebec1937c01e17c8f0f58e65dda6.tar.gz | |
Resolve conflicts in 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 |