Removed a conflict indicator...

[wxWidgets.git] / src / stc / scintilla / README.txt

diff --git a/src/stc/scintilla/README.txt b/src/stc/scintilla/README.txt
index 598da70f58b7750830d6a3857bfd8e80903418f9..98c4018245daeece4d84dea59b1f5d5876cd94d5 100644 (file)
--- a/src/stc/scintilla/README.txt
+++ b/src/stc/scintilla/README.txt
@@ -3,5 +3,5 @@ scintilla/include directories from the Scintilla/SCiTE source
 distribution.  All other code needed to implement Scintilla on top of
 wxWindows is located in the directory above this one.
 
 distribution.  All other code needed to implement Scintilla on top of
 wxWindows is located in the directory above this one.
 

-The current version of the Scintilla code is 1.39
+The current version of the Scintilla code is 1.40