Updated Branches: refs/heads/1.5.1-SNAPSHOT 60609f341 -> 090a8cf68
ACCUMULO-1819 Screwed up the merge conflict Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/090a8cf6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/090a8cf6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/090a8cf6 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 090a8cf68464e414741edbf4eefe9f47c59a4daf Parents: 60609f3 Author: Josh Elser <els...@apache.org> Authored: Mon Oct 28 00:07:50 2013 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Oct 28 00:07:50 2013 -0400 ---------------------------------------------------------------------- server/src/main/c++/nativeMap/Makefile | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/090a8cf6/server/src/main/c++/nativeMap/Makefile ---------------------------------------------------------------------- diff --git a/server/src/main/c++/nativeMap/Makefile b/server/src/main/c++/nativeMap/Makefile index f27afcd..2ff8ea5 100644 --- a/server/src/main/c++/nativeMap/Makefile +++ b/server/src/main/c++/nativeMap/Makefile @@ -43,7 +43,6 @@ ifeq ($(shell uname),Linux) endif ifeq ($(shell uname),Darwin) -<<<<<<< HEAD:server/src/main/c++/nativeMap/Makefile LIBS:= libNativeMap-Mac_OS_X-x86_64-64.jnilib # Update flags for OSX-10.9 and Xcode 5.0.1 # I think that we should be able to remove the `-undefined dynamic_lookup` option,
