Remove left over conflict markers from documentation.

[wxWidgets.git] / interface / wx / scopedarray.h

diff --git a/interface/wx/scopedarray.h b/interface/wx/scopedarray.h
index 1582f3c05dd19a532acc1559cc8092ca104b7d49..30b5ef8adef6eb946e1c7111d9d35a402de18a8f 100644 (file)
--- a/interface/wx/scopedarray.h
+++ b/interface/wx/scopedarray.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxScopedArray
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxScopedArray
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**