Bugfix

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28680 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/examples/step-42/step-42.cc b/deal.II/examples/step-42/step-42.cc
index d8dc043fcfdbbc32e377ce6d60c0eec2425622d6..501dac8dd1be9eb433b1bb79db8926b7320150a3 100644 (file)
--- a/deal.II/examples/step-42/step-42.cc
+++ b/deal.II/examples/step-42/step-42.cc
@@ -310,19 +310,11 @@ namespace Step42
   }
 
   template <int dim>
-<<<<<<< HEAD
-  void ConstitutiveLaw<dim>::plast_linear_hardening (SymmetricTensor<4,dim>  &stress_strain_tensor,
-                                                     SymmetricTensor<2,dim>  &strain_tensor,
-                                                     unsigned int            &elast_points,
-                                                     unsigned int            &plast_points,
-                                                     double                  &yield)
-=======
   void ConstitutiveLaw<dim>::plast_linear_hardening (SymmetricTensor<4,dim>      &stress_strain_tensor,
                                                      const SymmetricTensor<2,dim> &strain_tensor,
                                                      unsigned int                &elast_points,
                                                      unsigned int                &plast_points,
                                                      double                      &yield)
->>>>>>> mirror/trunk
   {
     if (dim == 3)
       {
@@ -351,15 +343,9 @@ namespace Step42
   }
 
   template <int dim>
-<<<<<<< HEAD
-  void ConstitutiveLaw<dim>::linearized_plast_linear_hardening (SymmetricTensor<4,dim>  &stress_strain_tensor_linearized,
-      SymmetricTensor<4,dim>  &stress_strain_tensor,
-      SymmetricTensor<2,dim>  &strain_tensor)
-=======
   void ConstitutiveLaw<dim>::linearized_plast_linear_hardening (SymmetricTensor<4,dim>                  &stress_strain_tensor_linearized,
                                                                                                                                SymmetricTensor<4,dim>           &stress_strain_tensor,
                                                                                                                                const SymmetricTensor<2,dim> &strain_tensor)
->>>>>>> mirror/trunk
   {
     if (dim == 3)
       {