From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/llcommon/lldate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/lldate.cpp')

diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
index 37b912df3d..3cc4cca706 100644
--- a/indra/llcommon/lldate.cpp
+++ b/indra/llcommon/lldate.cpp
@@ -34,7 +34,7 @@
 #include "linden_common.h"
 #include "lldate.h"
 
-#include "apr-1/apr_time.h"
+#include "apr_time.h"
 
 #include <iomanip>
 #include <sstream>
-- 
cgit v1.2.3