Murtadha Hubail has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/3066

Change subject: Merge commit 'b6a70e19' from stabilization-f69489
......................................................................

Merge commit 'b6a70e19' from stabilization-f69489

Change-Id: I9f09ed73f27090c5be7b1a665f4591b29a8cca12
---
M hyracks-fullstack/hyracks/hyracks-net/pom.xml
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/66/3066/1

diff --git a/hyracks-fullstack/hyracks/hyracks-net/pom.xml 
b/hyracks-fullstack/hyracks/hyracks-net/pom.xml
index 9b458cd..c842bf5 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml
@@ -61,15 +61,12 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-<<<<<<< HEAD   (43e0b1 [NO ISSUE][ING][EXT] Handle filters on meta() fields 
for fee)
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-=======
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>2.0.2-beta</version>
       <scope>test</scope>
->>>>>>> BRANCH (9a61bd [NO ISSUE][IDX][COMP] Creating an open index on 
non-declared)
     </dependency>
   </dependencies>
 </project>

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3066
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f09ed73f27090c5be7b1a665f4591b29a8cca12
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Murtadha Hubail <mhub...@apache.org>

Reply via email to