seems to compile ( tests comented out)

1 files changed, 1 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 345b53d..fdff199 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -455,8 +455,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             m_transactions.RemoveXferUploader(m_transactionID);
         }
 
-<<<<<<< HEAD
-=======
+
         private void ValidateAssets()
         {
             if (m_asset.Type == (sbyte)CustomAssetType.AnimationSet)
@@ -599,6 +598,5 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
             return result;
         }
->>>>>>> avn/ubitvar
     }
 }