Ignore conflicts between hidden files#2148

Holt59 merged 2 commits intoModOrganizer2:masterModOrganizer2/modorganizer:masterfrom

JonathanFeenstra:ignore-hidden-conflictsJonathanFeenstra/modorganizer:ignore-hidden-conflictsCopy head branch name to clipboard