Changeset 11419 for issm/trunk-jpl-damage/src/c/objects/Elements/Tria.h

Timestamp:

02/13/12 16:14:21 (13 years ago)

Author:

cborstad

Message:

cleaned up conflict flags after merge from trunk-jpl

File:

• issm/trunk-jpl-damage/src/c/objects/Elements/Tria.h (modified) (1 diff)

issm/trunk-jpl-damage/src/c/objects/Elements/Tria.h ¶

@@ -84 +84 @@
                 void   CreateKMatrix(Mat Kff, Mat Kfs,Vec df);
                 void   CreatePVector(Vec pf);
-<<<<<<< .working
-=======
                 void   CreateJacobianMatrix(Mat Jff);
->>>>>>> .merge-right.r11410
                 int    GetNodeIndex(Node* node);
                 int    Sid();