Fix merge conflict.
Showing
- TODO 0 additions, 113 deletionsTODO
- src/backend/__init__.py 0 additions, 0 deletionssrc/backend/__init__.py
- src/backend/backend.py 139 additions, 0 deletionssrc/backend/backend.py
- src/frontend/css/editor.css 82 additions, 11 deletionssrc/frontend/css/editor.css
- src/frontend/js/editor.js 180 additions, 23 deletionssrc/frontend/js/editor.js
- src/frontend/tpl/editor.html 12 additions, 11 deletionssrc/frontend/tpl/editor.html
- src/parser.py 35 additions, 12 deletionssrc/parser.py
- src/validation.py 13 additions, 0 deletionssrc/validation.py
- static/build/external/jquery 1 addition, 0 deletionsstatic/build/external/jquery
- static/external/codemirror2 1 addition, 0 deletionsstatic/external/codemirror2
- static/external/mathjax 1 addition, 0 deletionsstatic/external/mathjax
- static/frontend/css 1 addition, 0 deletionsstatic/frontend/css
- static/frontend/js 1 addition, 0 deletionsstatic/frontend/js
- static/img/cross.png 0 additions, 0 deletionsstatic/img/cross.png
- static/img/info.png 0 additions, 0 deletionsstatic/img/info.png
- static/img/load.gif 0 additions, 0 deletionsstatic/img/load.gif
- static/img/tick.png 0 additions, 0 deletionsstatic/img/tick.png
- tests/parser.py 6 additions, 0 deletionstests/parser.py
Loading
Please register or sign in to comment