From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 1 Mar 2013 09:04:14 +0000 (+0000)
Subject: Bugfix
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6395a4d4659c72520c532fed645b9ba89535ac4;p=dealii-svn.git

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 d8dc043fcf..501dac8dd1 100644
--- 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)
       {