fix compile error

GroundWu · GroundWu · commit 8c0e50ab54bd · 2024-11-06T09:58:35.000+08:00
diff --git a/src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/query/ObTableQuery.java b/src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/query/ObTableQuery.java
@@ -116,8 +116,6 @@ private boolean isKeyInRange(ObNewRange range, List<ObObj> key) {
         return withinStart && withinEnd;
     }
 
->>>>>>> ob/master
-
     /*
      * Check filter.
      */

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,6 @@ private boolean isKeyInRange(ObNewRange range, List<ObObj> key) {`
`116`	`116`	`return withinStart && withinEnd;`
`117`	`117`	`}`
`118`	`118`
`119`		`->>>>>>> ob/master`
`120`		`-`
`121`	`119`	`/*`
`122`	`120`	`* Check filter.`
`123`	`121`	`*/`