From 5b2296658948a81b2bbccab5ee4fb5e3d1824320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20=C3=9Cst=C3=BCnda=C4=9F?= Date: Sat, 26 Sep 2015 01:11:05 +0300 Subject: Merge branch 'master' of /Users/fatihustundag/Projects/rsync-time-backup with conflicts. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 723ef36..e8d64cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +test.sh \ No newline at end of file -- cgit v1.2.3