nibags updated this revision to Diff 70781. nibags added a comment.
- Resolve conflicts REPOSITORY R216 Syntax Highlighting CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D24982?vs=70779&id=70781 REVISION DETAIL https://phabricator.kde.org/D24982 AFFECTED FILES autotests/folding/highlight.y.fold data/syntax/apparmor.xml data/syntax/coffee.xml data/syntax/fortran-fixed.xml data/syntax/fortran-free.xml data/syntax/html.xml data/syntax/logcat.xml data/syntax/mustache.xml data/syntax/rust.xml data/syntax/selinux-cil.xml data/syntax/selinux-fc.xml data/syntax/selinux.xml data/syntax/xml.xml data/syntax/yacc.xml data/syntax/yaml.xml To: nibags, #framework_syntax_highlighting, dhaumann, cullmann Cc: kwrite-devel, kde-frameworks-devel, LeGast00n, GB_2, domson, michaelh, ngraham, bruns, demsking, cullmann, sars, dhaumann
