j143 commented on a change in pull request #953:
URL: https://github.com/apache/systemml/pull/953#discussion_r435984190
##########
File path: dev/docs/builtins-reference.md
##########
@@ -384,6 +453,21 @@ y = X %*% rand(rows = ncol(X), cols = 1)
w = lm(X = X, y = y)
ress = slicefinder(X = X,W = w, Y = y, k = 5, paq = 1, S = 2);
```
+<<<<<<< HEAD:docs/builtins-reference.md
Review comment:
This article could help resolve this error:
https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line
After that try the previous steps again from scratch.
1. Remove `mice` branch: `git branch -D mice`
2. Repeat the previous steps.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
