Permalink
Browse files

Merge branch 'sqlite-workaround' of https://github.com/henrik242/liqu…

…ibase into henrik242-sqlite-workaround

Conflicts:
	liquibase-core/src/main/java/liquibase/database/AbstractDatabase.java
  • Loading branch information...
1 parent cc6ca55 commit 20333bb46657ad7663e1050b693b5ddf657159c1 @nvoxland nvoxland committed Mar 9, 2012
Showing with 0 additions and 3 deletions.
  1. +0 −3 liquibase-core/src/main/java/liquibase/database/AbstractDatabase.java
@@ -30,12 +30,9 @@
import java.io.IOException;
import java.io.Writer;
import java.math.BigInteger;
-<<<<<<< HEAD
import java.sql.ResultSet;
import java.sql.SQLException;
-=======
import java.text.DateFormat;
->>>>>>> 114d3d4737e32c1cae3bf8b7746f61d6060a9682
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

0 comments on commit 20333bb

Please sign in to comment.