Skip to content

E
edx-platform
Commit c6b7c380 by Calen Pennington
Options

Merge pull request #110 from MITx/settings-fix 

settings import fix for mdx_circuit and mdx_image
parents 2be4f6a2 5997481d
Showing with 2 additions and 2 deletions
djangoapps/simplewiki/mdx_circuit.py
...@@ -17,7 +17,7 @@ circuit-schematic:[["r",[128,48,0],{"r":"1","_json_":0},["2","1"]],["view",0,0,2 ...@@ -17,7 +17,7 @@ circuit-schematic:[["r",[128,48,0],{"r":"1","_json_":0},["2","1"]],["view",0,0,2
import markdown import markdown
import re import re
import simplewiki.settings as settings import simplewiki.wiki_settings as settings
from django.utils.html import escape from django.utils.html import escape
......
djangoapps/simplewiki/mdx_image.py
...@@ -15,7 +15,7 @@ Ex: ...@@ -15,7 +15,7 @@ Ex:
Requires Python-Markdown 1.6+ Requires Python-Markdown 1.6+
''' '''
import simplewiki.settings as settings import simplewiki.wiki_settings as settings
import markdown import markdown
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment