docs and readme

ZIB-IOL · Sep 9, 2024 · b12a600 · b12a600
2 parents 950f078 + 9d99a1a
commit b12a600
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 # AbsSmoothFW.jl
+=======
+[![CI](https://github.com/ZIB-IOL/AbsSmoothFW.jl/actions/workflows/CI.yml/badge.svg)](https://github.com/ZIB-IOL/AbsSmoothFW.jl/actions/workflows/CI.yml)
+[![DOI](https://zenodo.org/badge/793075266.svg)](https://zenodo.org/doi/10.5281/zenodo.11198550)
+>>>>>>> 9d99a1a65b55abeddb97c7f1e9f0cabceae5acf8
 
 [![CI](https://github.com/ZIB-IOL/AbsSmoothFW.jl/actions/workflows/CI.yml/badge.svg)](https://github.com/ZIB-IOL/AbsSmoothFW.jl/actions/workflows/CI.yml)