diff options
| author | Fatih Üstündağ <fatih.ustundag@gmail.com> | 2015-09-26 01:11:05 +0300 |
|---|---|---|
| committer | Fatih Üstündağ <fatih.ustundag@gmail.com> | 2015-09-26 01:11:05 +0300 |
| commit | 5b2296658948a81b2bbccab5ee4fb5e3d1824320 (patch) | |
| tree | b1e51cea31961a6cef5cc8acd8ed7205d6cafc9b | |
| parent | 91fb6ffee7a50c52ba644991314289496074b7d5 (diff) | |
Merge branch 'master' of /Users/fatihustundag/Projects/rsync-time-backup with conflicts.
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1 +1,2 @@ -.idea
\ No newline at end of file +.idea +test.sh
\ No newline at end of file |