Closed samin2668 closed 2 years ago
You also have a merge conflict, you'll want to merge the develop branch into your feature branch to resolve that
develop
You also have a merge conflict, you'll want to merge the
develop
branch into your feature branch to resolve that