Skip to content
Commit 88157c46 authored by intrigeri's avatar intrigeri
Browse files

Replace config/APT_overlays with config/APT_overlays.d/*.

This avoids having to use a special merge driver when building on Jenkins, and
in general should make most merges "just work" as intended, minimizing both the
risk of merge conflicts that need to be dealt with manually, and the risk of Git
wrongly resolving merges automatically.
parent 2e743925
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment