[MOAB-dev] commit/MOAB: danwu: Fix merge conflicts in .gitignore

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/2e44578b75a6/
Changeset:   2e44578b75a6
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-03-13 22:08:46
Summary:     Fix merge conflicts in .gitignore

Affected #:  1 file

diff --git a/.gitignore b/.gitignore
index 41d33aa..94df472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,9 +58,6 @@ examples/SetsNTags
 examples/SkinMesh
 examples/structuredmesh
 examples/StructuredMeshSimple
-examples/SurfArea
-examples/TestErrorHandling
-examples/TestErrorHandlingPar
 examples/TestExodusII
 history??.jou
 hpctoolkit-*

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.