aboutsummaryrefslogtreecommitdiff
path: root/MANIFEST.in
diff options
context:
space:
mode:
authorzsloan2018-04-16 22:23:19 +0000
committerzsloan2018-04-16 22:23:19 +0000
commit35913e15bb6ac93c429e9465ebc36215cc6350ea (patch)
treed0eaff3a15bb167d995f1459ee7e744697f137b3 /MANIFEST.in
parent273b79a0c2096a2eae5ce9aa2800917437459f68 (diff)
parentf511e38a9b440d08313471cdcc7bfd99add98f70 (diff)
downloadgenenetwork2-35913e15bb6ac93c429e9465ebc36215cc6350ea.tar.gz
Resolved conflicts after pulling changes
Diffstat (limited to 'MANIFEST.in')
-rw-r--r--MANIFEST.in9
1 files changed, 0 insertions, 9 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 25beb977..0e0b4bd4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -52,15 +52,6 @@ include wqflask/wqflask/static/new/packages/DataTables/unit_testing/tests_onhold
include wqflask/wqflask/static/new/packages/DataTables/unit_testing/tests_onhold/6_delayed_rendering/*
include wqflask/wqflask/static/new/packages/DataTables/unit_testing/tests_onhold/1_dom/*
include wqflask/wqflask/static/packages/*
-include wqflask/wqflask/static/packages/TableTools/*
-include wqflask/wqflask/static/packages/TableTools/media/*
-include wqflask/wqflask/static/packages/TableTools/media/images/*
-include wqflask/wqflask/static/packages/TableTools/media/images/psd/*
-include wqflask/wqflask/static/packages/TableTools/media/swf/*
-include wqflask/wqflask/static/packages/TableTools/media/js/*
-include wqflask/wqflask/static/packages/TableTools/media/css/*
-include wqflask/wqflask/static/packages/TableTools/media/as3/*
-include wqflask/wqflask/static/packages/TableTools/media/as3/lib/*
include wqflask/wqflask/static/packages/underscore/*
include wqflask/wqflask/static/packages/bootstrap/*
include wqflask/wqflask/static/packages/bootstrap/fonts/*