search

ubsuny / 23-Homework1G3

Homework 1 Repository Group 3
0 stars 7 forks source link

Merge request conflict #40

Closed JustinJaniszewski closed 12 months ago

JustinJaniszewski commented 12 months ago

@reshnashrestha your multiple merge requests made it so I can not accept all of the time. Github says there are conflicts. Could you check the main branch and edit from there then make a new merge request.

reshnashrestha commented 12 months ago

Okay @JustinJaniszewski I'll fix this soon and then request you for new merge with complete documentation of our homework.