diff options
Diffstat (limited to 'initrd/distro-specs/ubuntu/config-5.10')
| -rw-r--r-- | initrd/distro-specs/ubuntu/config-5.10 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/initrd/distro-specs/ubuntu/config-5.10 b/initrd/distro-specs/ubuntu/config-5.10 index 32a63559..551156da 100644 --- a/initrd/distro-specs/ubuntu/config-5.10 +++ b/initrd/distro-specs/ubuntu/config-5.10 @@ -1,5 +1,3 @@ -<<<<<<< .mine -======= # Description: distro specific settings for Ubuntu Hoary Hedgehog (5.10) # defaults are taken from config-default file # @@ -29,5 +27,4 @@ # D_BOOTLOCAL - script for user specified stuff which should be started # during client bootup, path and file relative to /etc -# no changes from default ->>>>>>> .r256 +# no changes from default except: |