[MOAB-dev] commit/MOAB: danwu: Fix merge conflicts in examples/makefile

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/5002e508de4f/
Changeset:   5002e508de4f
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-02-14 19:18:11
Summary:     Fix merge conflicts in examples/makefile

Affected #:  1 file

diff --git a/examples/makefile b/examples/makefile
index 0895087..20843c0 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -7,8 +7,6 @@ include ${MOAB_DIR}/lib/iMesh-Defs.inc
 # MESH_DIR is the directory containing mesh files that come with MOAB source
 MESH_DIR="../MeshFiles/unittest"
 
-MOAB_CPPFLAGS += -DLOCDIR=examples/
-
 EXAMPLES = HelloMOAB GetEntities SetsNTags structuredmesh StructuredMeshSimple DirectAccessWithHoles DirectAccessNoHoles 
 PAREXAMPLES = HelloParMOAB ReduceExchangeTags LloydRelaxation
 F90EXAMPLES = DirectAccessNoHolesF90 PushParMeshIntoMoabF90

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.