legacy_merge

git pull https://github.com/transumption/holoportos master
remote: Enumerating objects: 76, done.
remote: Counting objects: 100% (76/76), done.
remote: Compressing objects: 100% (45/45), done.
remote: Total 1260 (delta 36), reused 55 (delta 23), pack-reused 1184
Receiving objects: 100% (1260/1260), 197.97 KiB | 3.00 MiB/s, done.
Resolving deltas: 100% (629/629), completed with 5 local objects.
From https://github.com/transumption/holoportos
 * branch            master     -> FETCH_HEAD
Removing tests/all-tests.nix
Removing scripts/hptest
Removing scripts/hpplustest
Removing scripts/holochain-config.toml
Removing packages/shutdown-led/shutdown-led.nix
Removing packages/shutdown-led/deps.nix
Removing packages/pre-net-led/pre-net-led.nix
Removing packages/pre-net-led/deps.nix
Removing packages/hptest/default.nix
Removing packages/hpplustest/default.nix
CONFLICT (modify/delete): packages/holoport-rust.nix deleted in 175aaf5eae7282ff90246ed90362bdf288631ddd and modified in HEAD. Version HEAD of packages/holoport-rust.nix left in tree.
Removing packages/holo-led/holo-led.nix
Removing packages/holo-led/deps.nix
Removing packages/holo-health/holo-health.nix
Removing packages/holo-health/deps.nix
Removing overlay.nix
CONFLICT (modify/delete): modules/version.nix deleted in 175aaf5eae7282ff90246ed90362bdf288631ddd and modified in HEAD. Version HEAD of modules/version.nix left in tree.
Removing modules/util.nix
CONFLICT (modify/delete): modules/user.nix deleted in 175aaf5eae7282ff90246ed90362bdf288631ddd and modified in HEAD. Version HEAD of modules/user.nix left in tree.
Removing modules/udiskie.nix
Removing modules/module-list.nix
CONFLICT (modify/delete): modules/base.nix deleted in 175aaf5eae7282ff90246ed90362bdf288631ddd and modified in HEAD. Version HEAD of modules/base.nix left in tree.
CONFLICT (modify/delete): modules/auto-update.nix deleted in 175aaf5eae7282ff90246ed90362bdf288631ddd and modified in HEAD. Version HEAD of modules/auto-update.nix left in tree.
Removing lib/make-ova.nix
Removing lib/make-iso.nix
Auto-merging default.nix
CONFLICT (content): Merge conflict in default.nix
Removing configuration.nix
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Removing .version
Automatic merge failed; fix conflicts and then commit the result.

git pull https://github.com/transumption/holoportos release
remote: Enumerating objects: 19, done.
remote: Counting objects: 100% (19/19), done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 1188 (delta 11), reused 12 (delta 10), pack-reused 1169
Receiving objects: 100% (1188/1188), 185.81 KiB | 461.00 KiB/s, done.
Resolving deltas: 100% (596/596), completed with 5 local objects.
From https://github.com/transumption/holoportos
 * branch            release    -> FETCH_HEAD
Removing tests/all-tests.nix
Removing scripts/hptest
Removing scripts/hpplustest
Removing scripts/holochain-config.toml
Removing packages/shutdown-led/shutdown-led.nix
Removing packages/shutdown-led/deps.nix
Removing packages/pre-net-led/pre-net-led.nix
Removing packages/pre-net-led/deps.nix
Removing packages/hptest/default.nix
Removing packages/hpplustest/default.nix
CONFLICT (modify/delete): packages/holoport-rust.nix deleted in 9bfed7ce04b636581348d3edec48c24ccacce1fe and modified in HEAD. Version HEAD of packages/holoport-rust.nix left in tree.
Removing packages/holo-led/holo-led.nix
Removing packages/holo-led/deps.nix
Removing packages/holo-health/holo-health.nix
Removing packages/holo-health/deps.nix
Removing overlay.nix
CONFLICT (modify/delete): modules/version.nix deleted in 9bfed7ce04b636581348d3edec48c24ccacce1fe and modified in HEAD. Version HEAD of modules/version.nix left in tree.
Removing modules/util.nix
CONFLICT (modify/delete): modules/user.nix deleted in 9bfed7ce04b636581348d3edec48c24ccacce1fe and modified in HEAD. Version HEAD of modules/user.nix left in tree.
Removing modules/udiskie.nix
Removing modules/module-list.nix
CONFLICT (modify/delete): modules/base.nix deleted in 9bfed7ce04b636581348d3edec48c24ccacce1fe and modified in HEAD. Version HEAD of modules/base.nix left in tree.
CONFLICT (modify/delete): modules/auto-update.nix deleted in 9bfed7ce04b636581348d3edec48c24ccacce1fe and modified in HEAD. Version HEAD of modules/auto-update.nix left in tree.
Removing lib/make-ova.nix
Removing lib/make-iso.nix
Auto-merging default.nix
CONFLICT (content): Merge conflict in default.nix
Removing configuration.nix
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Removing .version
Automatic merge failed; fix conflicts and then commit the result.