search

uzochukka1 / final_project_organization

0 stars 4 forks source link

merge conflict in Makefile #3

Open benkeser opened 1 year ago

benkeser commented 1 year ago

You have an unresolved merge conflict in your Makefile 

>>>>>>> 7f1601679da13ddc30f213376c3f5530b7947860
Make Install rule 

renv::restore()   #This restores the packages in the lockfile

<<<<<<< HEAD
renv::activate()   #This loads all necessary packages needed for the project
=======
renv::activate()   #This loads all necessary packages needed for the project

>>>>>>> 7f1601679da13ddc30f213376c3f5530b7947860

Please re-watch video on how to properly do a make install target