Skip to content

Commit

Permalink
fixed conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@brandmaier
brandmaier committed Mar 25, 2024
1 parent 0a1f762 commit 93edaea
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions DESCRIPTION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ License: GPL-3
Encoding: UTF-8
LazyLoad: yes
Version: 0.9.20
<<<<<<< HEAD
Date: 2024-03-25
=======
Date: 2024-03-14
>>>>>>> c1f3d72a029d525e9e8e407e29b9d0470819b468
RoxygenNote: 7.2.3
VignetteBuilder: knitr
BugReports: https://github.com/brandmaier/semtree/issues
Expand Down

0 comments on commit 93edaea

Please sign in to comment.