Skip to content
  • intrigeri's avatar
    Replace config/APT_overlays with config/APT_overlays.d/*. · 88157c46
    intrigeri authored
    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.
    88157c46