diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-29 11:24:59 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-29 11:24:59 +0100 |
| commit | abf0d19152cbf880252435d2801d852ce0459df8 (patch) | |
| tree | bfde55649a88754f29d5bdbd68d3d2817675d3e8 /pull_from_master.sh | |
| parent | a718775bd40db918564a31e90f4c17a98a4cecfc (diff) | |
| parent | dcf87bb7c912e4206aae1fd3c959d87e8f59242f (diff) | |
| download | prosody-abf0d19152cbf880252435d2801d852ce0459df8.tar.gz prosody-abf0d19152cbf880252435d2801d852ce0459df8.zip | |
Forced merge.
Diffstat (limited to 'pull_from_master.sh')
| -rwxr-xr-x | pull_from_master.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pull_from_master.sh b/pull_from_master.sh deleted file mode 100755 index 3c909b76..00000000 --- a/pull_from_master.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -which hg >/dev/null || echo "You must have Mercurial (the hg command)" -hg pull http://heavy-horse.co.uk:4000/ |