Create merge-demo.md

migavocarjo-okta · Jan 13, 2021 · b12b2a7 · b12b2a7
1 parent d08e635
commit b12b2a7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/merge-demo.md b/merge-demo.md
@@ -0,0 +1 @@
+this will be merged traditionally