| commit | 7515735be7d57d46b55fc50f43fb59a6a604c21b | [log] [tgz] |
|---|---|---|
| author | BalazsJako <this.is.balazs.jako@gmail.com> | Thu Sep 13 19:33:57 2018 +0100 |
| committer | BalazsJako <this.is.balazs.jako@gmail.com> | Thu Sep 13 19:33:57 2018 +0100 |
| tree | 418a9ba2a4dba81e0a56bb46979c66b2eb4a5686 | |
| parent | 44b608ea79d4c41a98146f8dd8855b676450de76 [diff] |
Resolved conflict between two merges.
diff --git a/TextEditor.h b/TextEditor.h index 214d3b4..cd7e37a 100644 --- a/TextEditor.h +++ b/TextEditor.h
@@ -149,7 +149,8 @@ Identifiers mIdentifiers; Identifiers mPreprocIdentifiers; std::string mCommentStart, mCommentEnd; - + bool mAutoIndentation; + TokenizeCallback mTokenize; TokenRegexStrings mTokenRegexStrings;