search

FoRTExperiment / fortedata

FoRTE project data
https://fortexperiment.github.io/fortedata/
Creative Commons Attribution 4.0 International
7 stars 11 forks source link

Git conflict lines in R files #68

Closed bpbond closed 2 years ago

bpbond commented 3 years ago

Currently four files have git conflict lines (e.g. <<<<<<< HEAD) in them:

fd_belowground_vignette.R fd_examples.R: fd_leaf_physiology_vignette.R fd_remote_sensing_vignette.R

bpbond commented 3 years ago

@atkinsjeff Do you want me clean up?

atkinsjeff commented 3 years ago

Sure, if it is not too much trouble on your part. I haven't seen where the conflicts are on my end.

Jeff Atkins, Ph.D Department of Biology Virginia Commonwealth University

On Wed, Dec 9, 2020, 18:00 Ben Bond-Lamberty notifications@github.com wrote:

@atkinsjeff https://github.com/atkinsjeff Do you want me clean up?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/FoRTExperiment/fortedata/issues/68#issuecomment-742117198, or unsubscribe https://github.com/notifications/unsubscribe-auth/AB7XVVIEXL5IAHX4KNJH2YDST76PPANCNFSM4UUFSJRA .

bpbond commented 3 years ago

Actually I can't, since I don't know what the intended outcome is.

For example, lines 94-98 in the remote sensing vignette are:

<<<<<<< HEAD
## ----rug, fig.width = 6, fig.height = 6, fig.align = "center", echo = FALSE----
=======
## ----rug, fig.height = 4, fig.width = 6, fig.align = "center"------------
>>>>>>> cb9893702271eb3ec6e45781def98757a5820179
x <- fd_canopy_structure()

This is master HEAD.

atkinsjeff commented 3 years ago

I think this is corrected. Not sure though.