search

wikipendium / wikipendium.no

Compendiums edited as a wiki.
https://www.wikipendium.no
Apache License 2.0
36 stars 5 forks source link

Broken auto-merging #438

Closed stianjensen closed 2 years ago

stianjensen commented 8 years ago

After #421 automatic merging has always failed with a merge conflict. This is caused by differing line endings on every line between the old and new version of the article. Moving the line-ending normalization from the model to the form should fix this issue.