geomemes/cis — Issue #8: resolve conflicts
Author: cmatthew
Created: 2011-10-11 20:25:01+00:00
State: open

We need to resolve all the conflicts between featurized modules.

Specifically, there is still a conflict between cis_con and cis_fieldwork in the image thumbnails.