git.99rst.org
/
openwrt-packages.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
81d4684
b898847
)
Merge pull request #18001 from turris-cz/chrony-conflicts
author
Josef Schlehofer
<redacted>
Mon, 7 Mar 2022 20:41:48 +0000
(21:41 +0100)
committer
GitHub
<redacted>
Mon, 7 Mar 2022 20:41:48 +0000
(21:41 +0100)
chrony: add conflict between without NTS and NTS variant
Trivial merge
git clone https://git.99rst.org/PROJECT
git.99rst.org / openwrt-packages.git / commitdiff