Merge pull request #1914 from peccu/prevent-parsig-filename-as-md-in-conflict-message

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge pull request #1914 from peccu/prevent-parsig-filename-as-md-in-conflict-message Prevent parsing filename as Markdown in conflict message master
commit 850429c507952e51ea992c1904c22de2b708cca2 2 parents b89c99d + 33812cb Naoki Takezoe authored on 19 Mar 2018 GitHub committed on 19 Mar 2018

Patch

Unified Split

Showing 1 changed file

Ignore Space Show notes View src/main/scala/gitbucket/core/service/MergeService.scala

Show line notes below