Correct Zenodo file

R-Lum · Jan 17, 2022 · da74d1c · da74d1c
1 parent 2375d91
commit da74d1c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -16,11 +16,7 @@
       "resource_type": "software"
     }
   ],
-<<<<<<< HEAD
-  "version": "0.9.17",
-=======
   "version": "0.9.18",
->>>>>>> dev_0.9.18
   "upload_type": "software",
   "keywords": ["Luminescence", "Luminescence dating", "Chronology", "Age models"],
   "publication_date": "2022-01-17",