Göran Krampe / Blimp

Commit 9eb8665e8052534e650d3d0e3faa4bfcbe95f804

Authored by Göran Krampe
1 parent c9027421

Missed a conflict marker

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