From 29d6d74b8ec6d4322d866a721d8869d5a0d35ce4 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 16 Oct 2008 13:14:26 +0100
Subject: [PATCH] updating failed conflict resolution

---
 .../Lists/DynamicList/DynamicListI.H          | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index cc12801065..434dfcb468 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -95,31 +95,6 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
 }
 
 
-template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
-(
-    const label s,
-    const T& t
-)
-{
-    if (s <= List<T>::size())
-    {
-        // shrink addressable size, leave allocated size untouched
-        List<T>::size() = s;
-    }
-    else
-    {
-        label nextFree = List<T>::size();
-        allocSize_ = s;
-        List<T>::setSize(allocSize_, t);
-        List<T>::size() = nextFree;
-=======
->>>>>>> olesenm:src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
-    }
-    List<T>::size(nextFree);
-}
-
-
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::clear()
 {