1 files changed, 0 insertions, 9 deletions

diff --git a/OpenSim/Services/Interfaces/IBakedTextureService.cs b/OpenSim/Services/Interfaces/IBakedTextureService.cs
index ab88695..69df4a0 100644
--- a/OpenSim/Services/Interfaces/IBakedTextureService.cs
+++ b/OpenSim/Services/Interfaces/IBakedTextureService.cs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
@@ -26,14 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-=======
-////////////////////////////////////////////////////////////////
-//
-// (c) 2009, 2010 Careminster Limited and Melanie Thielker
-//
-// All rights reserved
-//
->>>>>>> avn/ubitvar
 using System;
 using Nini.Config;