]> granicus.if.org Git - python/commit
projects / python / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f2ae39) | patch
Fix the merge conflict
authorSenthil Kumaran <senthil@uthcode.com>
Sat, 7 Sep 2013 21:12:55 +0000 (14:12 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Sat, 7 Sep 2013 21:12:55 +0000 (14:12 -0700)
commiteda7c641515f8af1f8700634b93eba859967379c
tree8411faad9c79019da0887fe970c1ee26468715b3tree | snapshot
parent2f2ae3903772263ef11d718b9112ae2036112f1bcommit | diff
Fix the merge conflict
Lib/site.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.