added naming conventions section

Big-Life-Lab · Feb 15, 2021 · e9267cc · e9267cc
2 parents 633c5f7 + 3b8b0aa
commit e9267cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/metadata.md b/metadata.md
@@ -1,4 +1,8 @@
 <!-- metadata.md is generated from metadata_template.md Please edit metadata_template.md file -->
+<<<<<<< HEAD
+=======
+<!-- create metadata.md with wbe_metadata_write() in generate_db_generation_sql.R -->
+>>>>>>> 3b8b0aa7fa0079c060e2b4a358356c442a8ad7f3
 
 # Metadata
 

diff --git a/metadata_template.md b/metadata_template.md
@@ -1,4 +1,5 @@
 <!-- metadata.md is generated from metadata_template.md Please edit metadata_template.md file -->
+<!-- create metadata.md with wbe_metadata_write() in generate_db_generation_sql.R -->
 
 # Metadata