merge conflict

8acde682 · Georges Kunstler · 427d7001 · da3984d8 · 8acde682 · 8acde682
Commit 8acde682 authored 11 years ago by Georges Kunstler
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 167 additions and 0 deletions
+167 -0
--- a/ms/metadata/Fushan/_site_details.csv
+++ b/ms/metadata/Fushan/_site_details.csv
--- a/ms/metadata/Fushan/files/Splist_Fushan_En.csv
+++ b/ms/metadata/Fushan/files/Splist_Fushan_En.csv
--- a/ms/metadata/Fushan/files/fs_trait_Kunstler.csv
+++ b/ms/metadata/Fushan/files/fs_trait_Kunstler.csv
--- a/ms/metadata/NSW/_file_index.csv
+++ b/ms/metadata/NSW/_file_index.csv
--- a/ms/metadata/NSW/_site_details.csv
+++ b/ms/metadata/NSW/_site_details.csv
--- a/ms/metadata/NSW/files/NSW_data_BRcontrols.csv
+++ b/ms/metadata/NSW/files/NSW_data_BRcontrols.csv
--- a/ms/metadata/NSW/files/NSW_data_BRtreatments.csv
+++ b/ms/metadata/NSW/files/NSW_data_BRtreatments.csv
--- a/ms/metadata/NSW/files/NSW_data_BS1.csv
+++ b/ms/metadata/NSW/files/NSW_data_BS1.csv
--- a/ms/metadata/NSW/files/NSW_data_BS2.csv
+++ b/ms/metadata/NSW/files/NSW_data_BS2.csv
--- a/ms/metadata/NSW/files/NSW_data_TND.csv
+++ b/ms/metadata/NSW/files/NSW_data_TND.csv
--- a/ms/metadata/NSW/files/NSW_traits.csv
+++ b/ms/metadata/NSW/files/NSW_traits.csv
--- a/ms/metadata/NVS/_file_index.csv
+++ b/ms/metadata/NVS/_file_index.csv
--- a/ms/metadata/NVS/_site_details.csv
+++ b/ms/metadata/NVS/_site_details.csv
--- a/ms/metadata/NVS/files/nz_plotinfo_130801.csv
+++ b/ms/metadata/NVS/files/nz_plotinfo_130801.csv
--- a/ms/metadata/NVS/files/nz_traits_130801.csv
+++ b/ms/metadata/NVS/files/nz_traits_130801.csv
--- a/ms/metadata/NVS/files/nz_treedata_growth_130801.csv
+++ b/ms/metadata/NVS/files/nz_treedata_growth_130801.csv
--- a/ms/metadata/Paracou/_file_index.csv
+++ b/ms/metadata/Paracou/_file_index.csv
--- a/ms/metadata/Paracou/_site_details.csv
+++ b/ms/metadata/Paracou/_site_details.csv
--- a/ms/metadata/Paracou/files/20130717_paracou_1984_2012.csv
+++ b/ms/metadata/Paracou/files/20130717_paracou_1984_2012.csv
--- a/ms/metadata/Paracou/files/20130717_paracou_codes_mesure.csv
+++ b/ms/metadata/Paracou/files/20130717_paracou_codes_mesure.csv