summaryrefslogtreecommitdiff
path: root/src/core/model/Document.cpp
diff options
context:
space:
mode:
authorBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2015-01-18 15:30:18 +0100
committerBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2015-01-18 15:30:18 +0100
commit8ab0709045667f8e1a67a9981c619980c9aebd1a (patch)
treef39812b3d216566de7c4dcdaacc7c607aa7e646c /src/core/model/Document.cpp
parentcd55519130c5f91d95107b3b1e1a8203caa5008a (diff)
parent372c67e0844654362fc7d440b0b4a31500a6d02a (diff)
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/model/Document.cpp')
-rw-r--r--src/core/model/Document.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp
index bf8bfde..cf6ded3 100644
--- a/src/core/model/Document.cpp
+++ b/src/core/model/Document.cpp
@@ -333,7 +333,7 @@ bool AnnotationEntity::doValidate(Logger &logger) const
/* Class Document */
-void Document::continueResolve(ResolutionState &state)
+void Document::doResolve(ResolutionState &state)
{
continueResolveComposita(annotations, annotations.getIndex(), state);
if (root != nullptr) {