trying to merge 2792

hackforla · Mar 12, 2022 · 4f10327 · 4f10327
2 parents f1bb6f9 + 29c57c0
commit 4f10327
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/_data/internal/credits/agile.yml b/_data/internal/credits/agile.yml
@@ -1,7 +1,11 @@
 ---
 title: Agile
 title-link: https://thenounproject.com/search/?creator=4249001&q=agile&i=2525741
+<<<<<<< HEAD
 content-type: image
+=======
+content-type: Image
+>>>>>>> 29c57c0fc1689198375732491c04b41a4328d537
 used-in: About
 artist: Tezar Tantular
 provider: Noun Project