Fixing merge conflict

This commit is contained in:
Chris Troutner
2020-12-18 14:43:40 -08:00
+2
View File
@@ -25,3 +25,5 @@ Standard workflow for setting up a development environment for working on this r
[MIT](./LICENSE.md)
t