diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-06-08 21:25:15 +0100 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-06-08 21:25:15 +0100 |
| commit | 10665df4465a4b51be12ca1d5bbaa00cad49113d (patch) | |
| tree | a480d353c384f2f1292b6aadcc650a0e64e3dcaf /Documentation | |
| parent | bump-python-revisions: Update tree before we touch it (diff) | |
| download | qt-10665df4465a4b51be12ca1d5bbaa00cad49113d.tar.gz qt-10665df4465a4b51be12ca1d5bbaa00cad49113d.tar.bz2 qt-10665df4465a4b51be12ca1d5bbaa00cad49113d.zip | |
bump-python-revisions: Fix merge leftover
Diffstat (limited to 'Documentation')
| -rwxr-xr-x | Documentation/maintainers/bump-python-revisions | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions index 3ffb23e4..f1183aeb 100755 --- a/Documentation/maintainers/bump-python-revisions +++ b/Documentation/maintainers/bump-python-revisions @@ -142,7 +142,6 @@ einfo """ ########################################################### """ -<<<<<<< HEAD ebegin "Updating tree" git pull eend $? |