Skip to content

Commit

Permalink
Merge branch 'featurecollection_cleanup' of github.com:geotools/geoto…
Browse files Browse the repository at this point in the history
…ols into featurecollection_cleanup

Conflicts:
	modules/library/render/src/main/java/org/geotools/renderer/lite/StreamingRenderer.java
	pom.xml
  • Loading branch information
jodygarnett committed Oct 31, 2012
2 parents 6ba39ad + 9070128 commit 011611a
Showing 1 changed file with 4 additions and 0 deletions.
Expand Up @@ -20,6 +20,10 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.awt.Dimension;
import java.awt.Point;
import java.awt.geom.Point2D;
Expand Down

0 comments on commit 011611a

Please sign in to comment.