fixing merge

actus10 · Dec 29, 2014 · 7cf2114 · 7cf2114
1 parent 166041f
commit 7cf2114
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
+
 include AUTHORS CHANGES README.rst LICENSE
-=======
-include AUTHORS CHANGES README LICENSE HACKING
-include README.rst
->>>>>>> 80f2aab41c02d9380c288da101dab90e79531c89
-recursive-include examples *
-recursive-include tests *
diff --git a/README.rst b/README.rst
@@ -1,8 +1,7 @@
-<<<<<<< HEAD
 
-===============================
+====
 dpkt
-===============================
+====
 
 fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols
 
@@ -64,25 +63,11 @@ To run the all tests run::
 
     tox
 
-=======
-dpkt
-====
-
-"fast, simple packet creation / parsing, with definitions for the basic
-TCP/IP protocols"
->>>>>>> 80f2aab41c02d9380c288da101dab90e79531c89
 
 Deviations from upstream
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD
 This code is based on `dpkt code <https://code.google.com/p/dpkt/>`__ lead by Dug Song.
-=======
-This code is based on Kiran Bandia's `dpkt
-fork <https://github.com/kbandla/dpkt>`__ which is of course based on
-the original `dpkt code <https://code.google.com/p/dpkt/>`__ lead by Dug
-Song.
->>>>>>> 80f2aab41c02d9380c288da101dab90e79531c89
 
 At this point, this is not the exact `upstream
 version <https://code.google.com/p/dpkt/>`__. If you are looking for the