diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 12:58:37 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 12:58:37 +0400 |
| commit | 94205f5f21c4d9942bb4205c06229438051b6853 (patch) | |
| tree | e23520f5a9c566e074426454a844d20087437098 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 347dd52019d57ae15c25d56a36aa881c0badc05f (diff) | |
Revert "Merge pull request #2449 from wkennington/master.grub"
This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing
changes made to 0078bc5d8f87512104902eab00c8a44bef286067.
Conflicts:
nixos/modules/installer/tools/nixos-generate-config.pl
nixos/modules/system/boot/loader/grub/install-grub.pl
nixos/release.nix
nixos/tests/installer.nix
I tried to keep apparently-safe code in conflicts.
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions