Resolve merge conflicts. (8e3fb9f7) · Commits · IPIPAN / ValUnifer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

ValUnifer
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Redmine
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8e3fb9f7

Commit 8e3fb9f7 authored 2 years ago by

dcz

Downloads
- Plain Diff

Resolve merge conflicts.

Bugfix for slowal frame verification status.

parents 266378e6 a0efc65b

Branches

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

entries/static/entries/css/unification_frames.css 4 additions, 0 deletions

entries/static/entries/css/unification_frames.css
entries/static/entries/js/selectional_preference.js 8 additions, 5 deletions

entries/static/entries/js/selectional_preference.js
entries/static/entries/js/unification.js 35 additions, 14 deletions

entries/static/entries/js/unification.js
unifier/views.py 2 additions, 0 deletions

unifier/views.py

with 49 additions and 19 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment