Strange line in the bottom of 4.4.2

NCEAS / datateam-training

Training and reference materials for ADC and SASAP data team members

https://nceas.github.io/datateam-training/training/

Apache License 2.0

7 stars 22 forks source link

Strange line in the bottom of 4.4.2 #168

Closed KellyWang1126 closed 3 years ago

KellyWang1126 commented 4 years ago

Should "======= >>>>>>> 9f923bd81a51f2f7215cd9e1881ac8d79c60ad24" be deleted?

eeerika commented 4 years ago

There's also a part right before 4.4.2 that says "<<<<<<< HEAD" which I also think should be fixed. I assume there's a typo in the code or something that's causing that to show.