fixed conflict

1 files changed, 1 insertions, 6 deletions

diff --git a/src/core/parser/Scope.hpp b/src/core/parser/Scope.hpp
index 9c5504f..5b19b3d 100644
--- a/src/core/parser/Scope.hpp
+++ b/src/core/parser/Scope.hpp
@@ -55,7 +55,7 @@ public:
 	 * Creates a new ScopedScope instance.
 	 *
 	 * @param scope is the backing Scope instance.
-	 * @param node is the Node instance that should be poped onto the stack of
+	 * @param node is the Node instance that should be pushed onto the stack of
 	 * the Scope instance.
 	 */
 	ScopedScope(Scope *scope, Handle<Node> node);
@@ -108,11 +108,6 @@ public:
 	Scope(Handle<Node> rootNode) { nodes.push_back(rootNode); }
 
 	/**
-	 * Returns a reference at the Manager instance all nodes belong to.
-	 */
-	Manager &getManager() { return getRoot()->getManager(); }
-
-	/**
 	 * Pushes a new node onto the scope.
 	 *
 	 * @param node is the node that should be used for local lookup.