added naming conventions section

Big-Life-Lab · Feb 15, 2021 · 534936b · 534936b
1 parent e9267cc
commit 534936b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/metadata.md b/metadata.md
@@ -1,8 +1,5 @@
 <!-- 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