Skip to content
Browse files

fix merge conflicts

  • Loading branch information...
2 parents ef13c7d + 17fcede commit ae23496a3635bf4fae4043d1c9b0d1766f369065 @patrickarlt patrickarlt committed
Showing with 2 additions and 3 deletions.
  1. +2 −3 spec/wktSpec.js
View
5 spec/wktSpec.js
@@ -1,6 +1,6 @@
if(typeof module === "object"){
- var Terraformer = require("terraformer");
- Terraformer.WKT = require("../terraformer-wkt-parser.js");
+ var Terraformer = require("terraformer");
+ Terraformer.WKT = require("../terraformer-wkt-parser");
}
beforeEach(function() {
@@ -24,7 +24,6 @@ describe("WKT Convert", function () {
expect(output).toEqual("POINT (30 10)");
});
-
it("should convert a POINT with Z", function () {
var input = {
type: "Point",

0 comments on commit ae23496

Please sign in to comment.
Something went wrong with that request. Please try again.