Resolved conflict

Author: rougier

_bibliography/published.bib

@@ -19,6 +19,28 @@ @Article {Casco-Rodriguez:2025
   language =     {Python},
   domain =       {Computational Neuroscience},
   keywords =     {rescience c, computational neuroscience, neuroengineering, signal processing, kalman filter, brain-computer interface, python, matlab}
+
+@Article {Caspar:2024,
+  author =       {Luc Caspar and Roger K. Moore},
+  title =        {{[Re] An anatomically constrained neural network model of fear conditioning}},
+  journal =      {ReScience C},
+  year =         {2024},
+  month =        {04},
+  volume =       {9},
+  number =       {5},
+  pages =        {{#18}},
+  doi =          {10.5281_zenodo.11077385},
+  url =          {https://zenodo.org/record/11077385/files/article.pdf},
+  code_url =     {https://gitlab.com/davinellulinvega/armony},
+  code_doi =     {},
+  code_swh =     {},
+  data_url =     {},
+  data_doi =     {https://doi.org/10.5281/zenodo.5550570},
+  review_url =   {https://github.com/ReScience/submissions/issues/60},
+  type =         {Replication},
+  language =     {Python},
+  domain =       {Computational Neuroscience},
+  keywords =     {rescience c, Python}
 }
 
 @Article {Maheshwari:2025,