[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/0a3cec9991bd/
Changeset:   0a3cec9991bd
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-02-14 19:03:46
Summary:     Fix merge conflicts in examples/makefile

Affected #:  1 file

diff --git a/examples/makefile b/examples/makefile
index a7de511..690113f 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -9,7 +9,7 @@ MESH_DIR="../MeshFiles/unittest"
 
 MOAB_CPPFLAGS += -DLOCDIR=examples/
 
-EXAMPLES = HelloMOAB GetEntities SetsNTags StructuredMeshSimple DirectAccessWithHoles DirectAccessNoHoles TestErrorHandling
+EXAMPLES = HelloMOAB GetEntities SetsNTags StructuredMeshSimple DirectAccessWithHoles DirectAccessNoHoles
 PAREXAMPLES = HelloParMOAB ReduceExchangeTags LloydRelaxation TestErrorHandlingPar
 F90EXAMPLES = DirectAccessNoHolesF90 PushParMeshIntoMoabF90
 EXOIIEXAMPLES = TestExodusII

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.