6 年之前 · d1e6de094d
--- a/ondemand/__init__.py
+++ b/ondemand/__init__.py
@@ -1,5 +1 @@
 
				-<<<<<<< HEAD
			
 
				-__version__ = '1.3.2-rc1'
			
 
				-=======
			
 
				 __version__ = '1.3.2-rc3'
			
 
				->>>>>>> 40e6041a5b04c058c2b0b7c83c8daccce8c1d6a6