diff options
Diffstat (limited to 'lang/python/docs/old-commits.log')
| -rw-r--r-- | lang/python/docs/old-commits.log | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/python/docs/old-commits.log b/lang/python/docs/old-commits.log index 0db59a08..93661e35 100644 --- a/lang/python/docs/old-commits.log +++ b/lang/python/docs/old-commits.log @@ -703,7 +703,7 @@ Date: Sat May 10 15:41:02 2014 +0100 Merge branch 'master' of bitbucket.org:malb/pyme Conflicts: - setup.py + setup.py commit eea6537921061b4dcfc54e00a99d3fa110e71433 Author: Martin Albrecht <[email protected]> |