Skip to content

update ToddBrown Branch#3

Merged
ktoddbrown merged 392 commits into
ktoddbrown:masterfrom
International-Soil-Radiocarbon-Database:master
Dec 7, 2019
Merged

update ToddBrown Branch#3
ktoddbrown merged 392 commits into
ktoddbrown:masterfrom
International-Soil-Radiocarbon-Database:master

Conversation

@ktoddbrown

Copy link
Copy Markdown
Owner

No description provided.

jb388 and others added 30 commits March 25, 2019 12:22
Some of the lyr_14c entries were missing a negative sign. These have now been corrected.
Merge branch 'master' of https://github.com/International-Soil-Radiocarbon-Database/ISRaD

# Conflicts:
#	DESCRIPTION
#	ISRaD_data_files/database/ISRaD_data.rda
#	ISRaD_data_files/database/ISRaD_data_flat_fraction.csv
#	ISRaD_data_files/database/ISRaD_data_flat_layer.csv
#	ISRaD_data_files/database/ISRaD_extra.rda
#	ISRaD_data_files/database/ISRaD_extra_flat_fraction.csv
#	ISRaD_data_files/database/ISRaD_extra_flat_incubation.csv
#	ISRaD_data_files/database/ISRaD_extra_flat_layer.csv
#	ISRaD_data_files/database/ISRaD_extra_list.xlsx
#	ISRaD_data_files/database/ISRaD_list.xlsx
#	ISRaD_data_files/database/ISRaD_log.txt
#	data/ISRaD_data.rda
#	data/ISRaD_extra.rda
Fixing template to work in online browser (#182)
jb388 and others added 29 commits November 18, 2019 11:11
This file describes naming conventions for geospatial data files that are added through ISRaD extra.
@ktoddbrown ktoddbrown merged commit dc55112 into ktoddbrown:master Dec 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants