diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-07-12 15:46:41 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2021-07-12 15:49:39 +0200 |
| commit | 04cd2da84c65b88b08c5e73141b37b991795e716 (patch) | |
| tree | c00796091ec9a8b07d2871c140650bcbbe1fc70f /src/libexpr/attr-path.hh | |
| parent | 644415d3912633773d2c8f219572fbfa452f4b56 (diff) | |
| parent | 9cf991f421b20a2c753df1f93730ddc8ddf7af6c (diff) | |
Merge branch 'master' into structured-attrs-shell
Conflicts:
src/nix/develop.cc
src/nix/get-env.sh
tests/shell.nix
Diffstat (limited to 'src/libexpr/attr-path.hh')
0 files changed, 0 insertions, 0 deletions