Merge branch 'unified-frame-edit-view-vue-dcz-sfc' of...
Merge branch 'unified-frame-edit-view-vue-dcz-sfc' of github.com:dareqx/ShellValier-v2 into unified-frame-edit-view-vue-dcz-sfc Conflicts: frontend/src/components/unification/Unification/Unification.vue frontend/src/components/unification/shared/frame-components/ExamplesComponent.vue frontend/src/components/unification/shared/frame-components/SemanticsSchemataComponent.vue frontend/src/components/unification/shared/frame-components/SlowalFrameComponent.vue
Showing
- entries/static/entries/js/unification.js 0 additions, 41 deletionsentries/static/entries/js/unification.js
- entries/static/entries/js/utils.js 0 additions, 10 deletionsentries/static/entries/js/utils.js
- entries/templates/entries_base.html 0 additions, 1 deletionentries/templates/entries_base.html
- entries/templates/test.html 0 additions, 23 deletionsentries/templates/test.html
- entries/views.py 0 additions, 4 deletionsentries/views.py
- frontend/src/components/unification/Unification/LexicalUnitEdit.vue 1 addition, 1 deletion...rc/components/unification/Unification/LexicalUnitEdit.vue
- frontend/src/components/unification/Unification/Unification.vue 76 additions, 0 deletions...nd/src/components/unification/Unification/Unification.vue
- frontend/src/components/unification/shared/frame-components/ExamplesComponent.vue 2 additions, 2 deletions...unification/shared/frame-components/ExamplesComponent.vue
- frontend/src/components/unification/shared/frame-components/SemanticsSchemataComponent.vue 1 addition, 1 deletion...on/shared/frame-components/SemanticsSchemataComponent.vue
- frontend/src/components/unification/shared/frame-components/SlowalFrameComponent.vue 1 addition, 1 deletion...fication/shared/frame-components/SlowalFrameComponent.vue
- frontend/src/main.js 8 additions, 1 deletionfrontend/src/main.js
Please register or sign in to comment