ian-h-chamberlain.com / dotfiles
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Mark .config/git/config as binary for conflicts

Ian Chamberlain 829462c1 9830ba6e

+1
+1
.gitattributes
··· 1 1 # Prevent breaking git with a bad config when it has conflicts 2 2 .gitconfig* merge=binary 3 + **/.config/git/config* merge=binary 3 4 **/lghub/settings.db diff=sqlite3 4 5 **/lghub/settings.db merge=keepTheir 5 6 *.pyz filter=lfs diff=lfs merge=lfs -text