Dont overwrite a file modified on both sides
Dont overwrite a file modified on both sides

nono/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,nono/cozy-desktop,nono/cozy-desktop,cozy-labs/cozy-desktop,nono/cozy-desktop