search

deepak2431 / gitseries

0 stars 33 forks source link

Arup #101

Open arupmaji404 opened 4 years ago

arupmaji404 commented 4 years ago

Lets solve the issue of merge conflict.

arupmaji404 commented 4 years ago

IMG_20200527_222408

This conflict is arising when i am trying to merge task4_1 and task4_2

arupmaji404 commented 4 years ago

IMG_20200527_193016 IMG_20200527_193001

Then i simply removed the conflicting drivers.