samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2025-06-16 21:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Patrick Skowronek
2022-07-19 14:18:48 +02:00
parent ef7b96372b
commit 8c982c939e
5 changed files with 5 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/systemd/bridgehead-update@.timer
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
[Unit]
Description=Nightly Updates of Bridgehead (%i)
@ -7,13 +6,3 @@ OnCalendar=*-*-* 03:00:00
[Install]
WantedBy=basic.target
=======
[Unit]
Description=Nightly Updates of Bridgehead (%i)
[Timer]
OnCalendar=*-*-* 03:00:00
[Install]
WantedBy=basic.target
>>>>>>> version-1