From: Chris Hilton <chilton@thoughtworks.com>
Date: Wed, 24 May 2006 18:08:41 +0000 (+0000)
Subject: Removed conflict markers
X-Git-Tag: v0.11008~439
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9fb7423bf3b975c6171c76f2e4c2908e8ad554ab;p=dbsrgits%2FSQL-Translator.git

Removed conflict markers
---

diff --git a/lib/SQL/Translator/Parser/DBI.pm b/lib/SQL/Translator/Parser/DBI.pm
index 3f72d7a..c42730a 100644
--- a/lib/SQL/Translator/Parser/DBI.pm
+++ b/lib/SQL/Translator/Parser/DBI.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Parser::DBI;
 
 # -------------------------------------------------------------------
-# $Id: DBI.pm,v 1.9 2006-05-24 14:45:21 schiffbruechige Exp $
+# $Id: DBI.pm,v 1.10 2006-05-24 18:08:41 duality72 Exp $
 # -------------------------------------------------------------------
 # Copyright (C) 2002-4 SQLFairy Authors
 #
@@ -121,7 +121,7 @@ query Oracle directly and skip the parsing of a text file, too.
 use strict;
 use DBI;
 use vars qw($VERSION @EXPORT);
-$VERSION = sprintf "%d.%02d", q$Revision: 1.9 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.10 $ =~ /(\d+)\.(\d+)/;
 
 use constant DRIVERS => {
     mysql            => 'MySQL',
@@ -143,11 +143,8 @@ use SQL::Translator::Parser::DBI::SQLServer;
 use SQL::Translator::Parser::DBI::SQLite;
 use SQL::Translator::Parser::DBI::Sybase;
 use SQL::Translator::Parser::DBI::PostgreSQL;
-<<<<<<< DBI.pm
 use SQL::Translator::Parser::DBI::DB2;
-=======
 use SQL::Translator::Parser::DBI::Oracle;
->>>>>>> 1.8
 
 use base qw(Exporter);
 @EXPORT = qw(parse);