merge

2015-09-23 05:54:57 -07:00
parent f049b660b9 28d17b28d0
commit e1098273c4
13 changed files with 369 additions and 133 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,7 @@
 include version.py
 include CHANGELOG.rst CONTRIBUTORS.rst LICENSE
+<<<<<<< HEAD
 include rtv.1
+=======
+include rtv/templates/*
+>>>>>>> 28d17b28d0840f75386586686897e9316378150e