Quick Save

rsdoiel · May 29, 2023 · 85fbbfa · 85fbbfa
2 parents f1ace89 + c5737c6
commit 85fbbfa
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -18,4 +18,12 @@ maintainers:
 repository-code: "https://github.com/rsdoiel/scripttool"
 version: 0.0.8
 license-url: "https://rsdoiel.github.io/scripttool/license.html"
+<<<<<<< HEAD
 keywords: [ "Github", "text markup", "screen play" ]
+=======
+keywords:
+ - Github
+ - text markup
+ - screen play
+date-released: 2022-11-24
+>>>>>>> c5737c65de66bf53b477318dcb9decd433872ecd