summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/mixins
ModeNameSize
-rw-r--r--line_conflict_actions.js182logplain
-rw-r--r--line_conflict_utils.js256logplain