Commit 6200830ae2765e7c8941f5f5d4ce8c07630479f5
Fixed conflict.
Showing
1 changed file
with
4 additions
and
0 deletions
blimp.nim
| @@ -36,7 +36,11 @@ let | @@ -36,7 +36,11 @@ let | ||
| 36 | [rsync] | 36 | [rsync] |
| 37 | # Set this to your remote rsync daemon area | 37 | # Set this to your remote rsync daemon area |
| 38 | remote = "blimpuser@some-rsync-server.com::blimpstore" | 38 | remote = "blimpuser@some-rsync-server.com::blimpstore" |
| 39 | +<<<<<<< HEAD | ||
| 39 | password = "some-good-rsync-password-for-blimpuser" | 40 | password = "some-good-rsync-password-for-blimpuser" |
| 41 | +======= | ||
| 42 | +password = some-good-rsync-password-for-blimpuser | ||
| 43 | +>>>>>>> abbc06c70c476280fd304b432c6f4d42caaecabf | ||
| 40 | 44 | ||
| 41 | # The following three formats should not need editing | 45 | # The following three formats should not need editing |
| 42 | # $1 is filename, $2 is remote and $3 is the local blimpstore | 46 | # $1 is filename, $2 is remote and $3 is the local blimpstore |