.

GreycLab · Jun 25, 2024 · 435a93b · 435a93b
1 parent d3a7137
commit 435a93b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 655 deletions.
diff --git a/Makefile b/Makefile
@@ -79,3 +79,6 @@ joss: paper.pdf
 
 paper.pdf: paper.md paper.bib
 	@docker run --rm --volume $$PWD:/data --user $$(id -u):$$(id -g) --env JOURNAL=joss openjournals/inara
+
+%:
+	cd src && $(MAKE) $*
diff --git a/paper.bib b/paper.bib
@@ -36,10 +36,7 @@ @inproceedings{tschumperle2022automatic
   booktitle={2022 IEEE International Conference on Image Processing (ICIP)},
   pages={371--375},
   year={2022},
-<<<<<<< HEAD
-=======
   doi = {10.1109/icip46576.2022.9897386},
->>>>>>> bd4aac57bdad4a5e237d2655d81736575a4c9b2b
   organization={IEEE}
 }
 
@@ -49,10 +46,7 @@ @inproceedings{samuth2022patch
   booktitle={2022 IEEE International Conference on Image Processing (ICIP)},
   pages={3490--3494},
   year={2022},
-<<<<<<< HEAD
-=======
   doi={10.1109/icip46576.2022.9897334},
->>>>>>> bd4aac57bdad4a5e237d2655d81736575a4c9b2b
   organization={IEEE}
 }
 
@@ -71,10 +65,7 @@ @article{tschumperle2020reconstruction
   number={3},
   pages={1511--1535},
   year={2020},
-<<<<<<< HEAD
-=======
   doi={10.1137/19m1306798},
->>>>>>> bd4aac57bdad4a5e237d2655d81736575a4c9b2b
   publisher={SIAM}
 }
 
@@ -86,10 +77,7 @@ @article{buyssens2015exemplar
   number={6},
   pages={1809--1824},
   year={2015},
-<<<<<<< HEAD
-=======
   doi={10.1109/tip.2015.2411437},
->>>>>>> bd4aac57bdad4a5e237d2655d81736575a4c9b2b
   publisher={IEEE}
 }
 
@@ -121,11 +109,7 @@ @misc{melindagreen93
 
 @misc{jehan18,
   title={{L}ineart {B}ucket {F}ill},
-<<<<<<< HEAD
-  author={GIMP Developers},
-=======
   author={GIMP},
->>>>>>> bd4aac57bdad4a5e237d2655d81736575a4c9b2b
   url={https://developer.gimp.org/core/algorithm/line-art-bucket-fill/},
   year={2018}
 }
@@ -199,10 +183,7 @@ @article{openmp
   number={1},
   pages={46--55},
   year={1998},
-<<<<<<< HEAD
-=======
   doi={10.1109/99.660313},
->>>>>>> bd4aac57bdad4a5e237d2655d81736575a4c9b2b
   publisher={IEEE}
 }
 
@@ -221,9 +202,6 @@ @article{ray2023outflows
   number={7981},
   pages={48--52},
   year={2023},
-<<<<<<< HEAD
-=======
   doi={10.1038/s41586-023-06551-1},
->>>>>>> bd4aac57bdad4a5e237d2655d81736575a4c9b2b
   publisher={Nature Publishing Group UK London}
 }