Closed shesha1096 closed 3 years ago
Hi @gpabon! The merge conflicts have been resolved. I was not able to push the code since we had created a rule during our last meeting to prevent merging with main branch unless it has been approved by the reviewer. I will go ahead and push the code today!
Hi @shesha1096, the pull request has 3 conflicts please take a look