weecology / MillionTrees

The MillionTreesBenchmark
https://milliontrees.idtrees.org/
GNU General Public License v3.0
9 stars 3 forks source link

Remove merge conflict markers #7

Closed ethanwhite closed 9 months ago

ethanwhite commented 9 months ago

Merging since I'm going to mention this link in my talk today and hopefully this will fix the table rendering issue on the website

bw4sz commented 9 months ago

thanks. I haven't been paying attention to this repo really yet.

On Wed, Feb 7, 2024 at 7:32 AM Ethan White @.***> wrote:

Merged #7 https://github.com/weecology/MillionTrees/pull/7 into main.

— Reply to this email directly, view it on GitHub https://github.com/weecology/MillionTrees/pull/7#event-11734112241, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAJHBLB64O62AA4QAJ4HC6TYSONAVAVCNFSM6AAAAABC6BHEZOVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJRG4ZTIMJRGIZDIMI . You are receiving this because you are subscribed to this thread.Message ID: @.***>

-- Ben Weinstein, Ph.D. Research Scientist University of Florida

ethanwhite commented 9 months ago

yeah, I figured. I just wanted a quick to mention place folks could do if they were interested in contributing and the website does that nicely