diff options
| author | atupal <me@atupal.org> | 2013-08-12 09:30:46 +0800 |
|---|---|---|
| committer | atupal <me@atupal.org> | 2013-08-12 09:30:46 +0800 |
| commit | 97c198524f380c82fe53efe8c302a7f24d143690 (patch) | |
| tree | 686d85bcb990ec82cd9f6f0ddd2e35b0ea98d757 | |
| parent | 9d4630615b3cc5a36ea457dd1f672050e91c1543 (diff) | |
| parent | 2f856c6503ca4ede2d0853470326731620232557 (diff) | |
| download | urllib2_kerberos-97c198524f380c82fe53efe8c302a7f24d143690.tar.gz | |
init merger
| -rw-r--r-- | .gitignore | 38 | ||||
| -rw-r--r-- | README.md | 2 |
2 files changed, 40 insertions, 0 deletions
@@ -1,4 +1,42 @@ +<<<<<<< HEAD syntax: glob *.pyc *~ +======= +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject +>>>>>>> 2f856c6503ca4ede2d0853470326731620232557 diff --git a/README.md b/README.md new file mode 100644 index 0000000..a2b216e --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +urllib2_kerberos +================ |