diff options
| author | Jan Kaluza <jkaluza@redhat.com> | 2013-10-24 12:30:13 +0200 |
|---|---|---|
| committer | Jan Kaluza <jkaluza@redhat.com> | 2013-10-24 12:30:13 +0200 |
| commit | f735ee187e9904fc42db2eb54b99bc4f82ef610f (patch) | |
| tree | 304ec1c627324ed8b37e2fdfc9d23746400b8b6b /pullrev.sh | |
| parent | b3f304619b84e409ed109bd6fc4cad3c4fcf03d6 (diff) | |
| parent | aa55b1c6dd6d51e5fdee1cdeca7e90fa04c66f29 (diff) | |
| download | httpd-f735ee187e9904fc42db2eb54b99bc4f82ef610f.tar.gz httpd-f735ee187e9904fc42db2eb54b99bc4f82ef610f.tar.xz httpd-f735ee187e9904fc42db2eb54b99bc4f82ef610f.zip | |
Fix merge conflicts
Diffstat (limited to 'pullrev.sh')
| -rwxr-xr-x | pullrev.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6,7 +6,7 @@ if [ $# -lt 1 ]; then fi repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk" -ver=2.4.3 +ver=2.4.6 prefix="httpd-${ver}" suffix="r$1${2:++}" fn="${prefix}-${suffix}.patch" |