Skip to content

Commit

Permalink
merge from devel
Browse files Browse the repository at this point in the history
  • Loading branch information
andre-merzky committed Jan 17, 2024
2 parents cf00894 + 97517c6 commit a21c76e
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
<<<<<<< HEAD
1.47.0
=======
1.46.1
>>>>>>> master

0 comments on commit a21c76e

Please sign in to comment.