diff options
author | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
---|---|---|
committer | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
commit | 6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch) | |
tree | 613944f1de089105950a86501507b6aa2151380d /data/kernel_version | |
parent | b229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff) | |
parent | 8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff) | |
download | vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip |
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in:
* scripts/live-build-config
- kernel parameters
* scripts/build-packages
- fixed list of packages to compile
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 51333a00..00000000 --- a/data/kernel_version +++ /dev/null @@ -1 +0,0 @@ -4.19.40-amd64-vyos |