fixing conflicts from previous refactor attempt

txbm · Oct 14, 2013 · b24cdf2 · b24cdf2
2 parents 2d52f28 + be87ffa
commit b24cdf2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/TODO.md b/TODO.md
@@ -0,0 +1,2 @@
+* Add connection pooling
+* Add options for split_size uploads, parallel uploads and reduced redundancy storge for insensitive data.
diff --git a/assetman/__init__.py b/assetman/__init__.py
@@ -11,4 +11,4 @@ def create_blob(data):
 	return Asset(data)
 
 def create_image(data, height, width, mimetype):
-	return Image(data, height, width, mimetype)
+	return Image(data, height, width, mimetype)
diff --git a/setup.py b/setup.py
@@ -4,7 +4,11 @@
 
 setup(
 	name='assetman',
+<<<<<<< HEAD
 	version='0.0.2',
+=======
+	version='0.1',
+>>>>>>> be87ffa6fa2fc0d0bca3ba570445746cacda6e26
 	url='http://github.com/petermelias/assetman',
 	license='BSD',
 	author='Peter M. Elias',