5 Commits

Author	SHA1	Message	Date
Matthew Honnibal	c6dc151fc3	* Fix spans/test_merge.py	2015-06-07 18:46:16 +02:00
Matthew Honnibal	2676240cbb	* Fix spans/test_merge.py	2015-06-07 18:45:19 +02:00
Matthew Honnibal	9abb0dd4fd	* Fix spans/test_merge.py	2015-06-07 18:44:18 +02:00
Matthew Honnibal	88041f69d1	* More work on reorganising tests, using conftest.py	2015-06-07 18:02:24 +02:00
Matthew Honnibal	d37dca72dd	* Reorganize tests	2015-06-07 16:49:46 +02:00