diff options
| author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-07 10:07:35 +0100 |
|---|---|---|
| committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-07 10:14:47 +0100 |
| commit | f52c3b345be8e5aa1af8bdebcc70c852bb320568 (patch) | |
| tree | eba1fc570ee7bbf8f32c257c0289f6cc59d991be /.gitignore | |
| parent | 09ad28b28c9ebd9308cfe9048686b3b0ef9cfd9c (diff) | |
| download | vyos-1x-f52c3b345be8e5aa1af8bdebcc70c852bb320568.tar.gz vyos-1x-f52c3b345be8e5aa1af8bdebcc70c852bb320568.zip | |
util: T2226: fix merge conflict
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions