From ebeed4893e1345f863b45e4a87a619c1637efcb9 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 1 May 2018 10:58:55 -0400 Subject: [PATCH] Merge in custom-release-may-2018 and resolve conflicts --- Core/nbproject/project.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index b73c5ba277..0e683d15fd 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -18,10 +18,7 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar file.reference.StixLib.jar=release/modules/ext/StixLib.jar -<<<<<<< HEAD file.reference.sleuthkit-postgresql-4.6.1.jar=release/modules/ext/sleuthkit-postgresql-4.6.1.jar -======= ->>>>>>> upstream/custom-release-may-2018 file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0.1.jar file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar