diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
| commit | 7e2a2e37e72e649b5eb42362e0469101c7ce19cc (patch) | |
| tree | 636944e4ba7bcb13bd18bc3f70391faab8c3ebcc /data/kernel_version | |
| parent | 819bb96bd26c1495d6fef2e6477bb96cf147ec22 (diff) | |
| parent | dda8ec6f3a46b2dfe9f627c620b7fb57c25d70dc (diff) | |
| download | vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.tar.gz vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.zip | |
Merge branch 'current' into crux
Conflicts:
data/kernel_version
scripts/build-config
scripts/defaults.py
scripts/live-build-config
Diffstat (limited to 'data/kernel_version')
| -rw-r--r-- | data/kernel_version | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/data/kernel_version b/data/kernel_version deleted file mode 100644 index cef3eaf2..00000000 --- a/data/kernel_version +++ /dev/null @@ -1 +0,0 @@ -4.19.28 |