Resolve conflicts happening when using file synchronization tools
Primary LanguageEmacs LispGNU General Public License v3.0GPL-3.0