diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 92f8c51..6e2f7f3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -64,11 +64,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
64 | public List<UUID> folders; | 64 | public List<UUID> folders; |
65 | } | 65 | } |
66 | 66 | ||
67 | <<<<<<< HEAD | ||
68 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
69 | ======= | ||
70 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 67 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
71 | >>>>>>> avn/ubitvar | ||
72 | 68 | ||
73 | /// <summary> | 69 | /// <summary> |
74 | /// Control whether requests will be processed asynchronously. | 70 | /// Control whether requests will be processed asynchronously. |