(#60) Downgrade to C++14

tsoding / ray-tracer

My ongoing effort to learn how to make Ray Tracers

MIT License

15 stars 2 forks source link

(#60) Downgrade to C++14 #61

Closed notzain closed 5 years ago

notzain commented 5 years ago

Not used to making PR's, so kindly correct me when I'm doing something wrong.

rexim commented 5 years ago

@notzain I merged #59 before you submitted your PR and now your PR conflicts with the master. What you have to do now is

rebase your branch onto the latest master,
resolve the conlicts
and forse push your branch

(If you're not very experienced with git, I'd recommend to just scrap the work, fetch the latest master and do it again. Luckly changes are pretty small)

notzain commented 5 years ago

@rexim Alright, I rebased to upstream master. Had a guide open, so it wasn't (very) hard. :)

rexim commented 5 years ago

@notzain looks good to me! Thank you for donating your personal time to this project!