Github user njayaram2 commented on a diff in the pull request:
https://github.com/apache/incubator-madlib/pull/77#discussion_r93533466
--- Diff: src/ports/postgres/modules/utilities/in_mem_group_control.py_in
---
@@ -333,9 +335,15 @@ class GroupIterationController:
self.in_with = True
return self
+<<<<<<< HEAD
def are_last_state_value_zero(self):
return self.new_states.are_last_state_value_zero()
-
+
+=======
+ def get_last_state_value(self):
+ return self.new_states.get_last_state_value()
+
+>>>>>>> 63616e3... Elastic net: Add cross validation
def info(self):
--- End diff --
Is there something wrong with the rebase here?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
