diff options
| -rwxr-xr-x | scripts/git-sync-noconflict (renamed from scripts/git-sync) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/scripts/git-sync b/scripts/git-sync-noconflict index e0117d7..e0117d7 100755 --- a/scripts/git-sync +++ b/scripts/git-sync-noconflict |