From f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Wed, 13 Jun 2007 18:02:37 +0000
Subject: result of merge manually performed through diff and patch. svn diff
 svn+ssh://svn/svn/linden/release@63615
 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in
 release

---
 indra/win_updater/updater.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/win_updater')

diff --git a/indra/win_updater/updater.cpp b/indra/win_updater/updater.cpp
index c5207f0082..536553a4ed 100644
--- a/indra/win_updater/updater.cpp
+++ b/indra/win_updater/updater.cpp
@@ -147,7 +147,7 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled)
 			fflush(logfile);
 		}
 #endif
-		
+
 #if _DEBUG
 		fprintf(logfile,"Reading Data, bytes_read = %d\n",bytes_read);
 		fflush(logfile);
-- 
cgit v1.2.3