Merge pull request #426 from edx/carol/AccessibilityFix

Fix: Remove merge conflict tag
openedx · Jul 2, 2015 · 138928c · 138928c
2 parents 99afb49 + 9c6aca3
commit 138928c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/en_us/shared/accessibility/best_practices_course_content_dev.rst b/en_us/shared/accessibility/best_practices_course_content_dev.rst
@@ -692,10 +692,9 @@ you use MathJax to author your math content. MathJax renders math in a variety
 of formats on the client side, offering the end user the ability to consume
 math content in their preferred format. EdX Studio supports authoring math
 directly in LaTeX using the `LaTeX Source Compiler
-<https://edx.readthedocs.org/projects/edx-partner-course-
-staff/en/latest/creating_content/create_html_component.html#import-latex-
-code>`_ to transform LaTeX into MathJax.
->>>>>>> Finalize Accessibility Best Practices document
+<https://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/
+create_html_component.html#import-latex-code>`_ to transform LaTeX into MathJax.
+
 
 ======================================================
 Accessible Mathematical Content Resources