resolved conflict (because I forgot to commit before)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index e789eb5d11d7c4bb1ee5b330c5258f19c7ba1d0e..9b651102d7dd68c80be28cd58ca7ddfe813a2fc7 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -237,6 +237,8 @@ protected:
     };
 
     // Copies selection to clipboard if the clipboard support is available
+    //
+    // returns true if anything was copied to clipboard, false otherwise
     bool CopySelection(ClipboardType t = Secondary);
 
 #if wxUSE_CLIPBOARD