merge pull error

Merge branch 'dev' of gitlab-ssh.irstea.fr:jean-baptiste.feret/biodivMapR into dev # Conflicts: # NEWS.md

merge pull error
Merge branch 'dev' of gitlab-ssh.irstea.fr:jean-baptiste.feret/biodivMapR into dev # Conflicts: # NEWS.md
74215ec1 · floriandeboissieu · 3bf536da · 7bf15427 · 74215ec1
Commit 74215ec1 authored Oct 18, 2019 by floriandeboissieu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

NEWS.md NEWS.md +1 -0

No files found.
--- a/NEWS.md
+++ b/NEWS.md
 # biodivMapR v1.0.2
+
 ## Fixes

 ## Changes