Merge branch 'c9s' of gitlab.com:thalman/libuser into c9s

2021-05-20 13:54:36 +02:00 · 2021-05-20 13:54:36 +02:00 · 0c99c6490f
commit 0c99c6490f
parent 96f73a029a 96fbb4a91a
1 changed files with 3 additions and 0 deletions
--- a/libuser.spec
+++ b/libuser.spec
@ -117,6 +117,7 @@ make
 %{_datadir}/gtk-doc/html/*

 %changelog
+<<<<<<< HEAD
 * Thu May 20 2021 Tomas Halman <thalman@redhat.com> 
 - Enable audit library in the build 
 - Resolves: rhbz#1923043 - libuser doesn't audit events around the account lifecycle
@ -125,6 +126,8 @@ make
 - Renaming python package according to the standard
 - Resolves: rhbz#1951968

+=======
+>>>>>>> 96fbb4a91a8471e931d872e7b696d176fc351605
 * Wed May 5 2021 Tomas Halman <thalman@redhat.com>
 - Resolves: rhbz#1951601 - Remove fakeroot dependency