From bd1e9c12b18a09228ddfb94c386677f686ce08b4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 Jun 1999 11:51:07 +0000
Subject: [PATCH] just to resolve a dummy conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/dcbase.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 3f2efc403c..7eab6ec026 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -17,15 +17,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
    #include "wx/window.h"
+#endif
+
 #ifdef __WXMSW__
    #include "wx/msw/private.h"
 #endif
-#endif
 
 #include "wx/dc.h"
 
-- 
2.45.2