Remove accidentally committed conflict junk
Remove accidentally committed conflict junk

femhub/CodeMirror2,leoshine/CodeMirror,filonb/CodeMirror2,filonb/CodeMirror2,femhub/CodeMirror2,femhub/CodeMirror2,leoshine/CodeMirror,filonb/CodeMirror2