Files
deb-python-cassandra-driver/cqlengine/VERSION
timmartin19 ca3915aeb6 Merge branch 'master' of https://github.com/timmartin19/cqlengine
Conflicts:
	cqlengine/VERSION
	cqlengine/models.py
	cqlengine/query.py
2014-10-20 10:14:43 -04:00

6 lines
54 B
Plaintext

<<<<<<< HEAD
0.19.0
=======
0.18.2
>>>>>>> FETCH_HEAD