From 260579e4c3c1736ad76593e3fe6c87f62204da5a Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Thu, 28 Sep 2017 09:41:06 +0800
Subject: [PATCH] fxied conflicts.

---
 src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java
index 557ce66e51..eade2148be 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.expr;
 import com.alibaba.druid.sql.ast.SQLExprImpl;
 import com.alibaba.druid.sql.ast.SQLObject;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-git 
+
 import java.util.Collections;
 import java.util.List;