ops

2015-09-23 05:56:35 -07:00
parent e1098273c4
commit 041b6e745a
2 changed files with 0 additions and 7 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,4 @@
 include version.py
 include CHANGELOG.rst CONTRIBUTORS.rst LICENSE
-<<<<<<< HEAD
 include rtv.1
-=======
 include rtv/templates/*
->>>>>>> 28d17b28d0840f75386586686897e9316378150e