From f7da7f99f6984f0f45a2f6ef7a89277e118ddf9a Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <bnzanette@inf.ufpr.br>
Date: Mon, 28 Sep 2015 22:36:52 -0300
Subject: [PATCH] Fix merge conflicts
---
app/repositories/orient_db/learning_object_repository.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/repositories/orient_db/learning_object_repository.rb b/app/repositories/orient_db/learning_object_repository.rb
index c31fc0f9..54dcfb07 100644
--- a/app/repositories/orient_db/learning_object_repository.rb
+++ b/app/repositories/orient_db/learning_object_repository.rb
@@ -22,7 +22,7 @@ module OrientDb
# end
def all(limit = 100, offset = 0)
learning_objects_hash = connection.query "SELECT FROM LearningObject LIMIT #{limit} OFFSET #{offset}", {limit: limit}
- learning_objects = build_learning_objects(learning_objects_hash) || []
+ build_objects(learning_objects_hash) || []
end
# Usage:
--
GitLab