search

rishabhshuklax / getsetfoss

Other
3 stars 69 forks source link

Branch 1.5(changes you requested are done) #61

Closed blank-27 closed 4 years ago

dojutsu-user commented 4 years ago

Please resolve the merge conflicts.

blank-27 commented 4 years ago

Sorry Sir ,I don't know how to resolve merge conflict.

On Tue, Nov 5, 2019 at 5:19 PM Vaibhav Gupta notifications@github.com wrote:

Please resolve the merge conflicts.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/blurry-x-face/getsetfoss/pull/61?email_source=notifications&email_token=ANJYIZDIFVDCL2VLHPVJWWLQSFMTVA5CNFSM4JIX5KVKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDCSEKY#issuecomment-549790251, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANJYIZDLQHUKNK2NPJ3ESGTQSFMTVANCNFSM4JIX5KVA .

dojutsu-user commented 4 years ago

@blank-27

Sorry Sir ,I don't know how to resolve merge conflict.

That's the whole point of Get Set FOSS. You will learn many things that are required for GSoC. You are doing great :tada:. Search your doubts on Google, it will help you a lot.

rishabhshuklax commented 4 years ago

You already have #34 opened. First close that then open any new PR for the same issue.