diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-02-25 21:27:56 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-02-25 21:27:56 -0700 |
| commit | 70e935db5bc16e5a7144dd0de3176d53dd892301 (patch) | |
| tree | 2bf0334734b9e2ae30a17f0af31f4066c2b8bbb5 /lib/libcxx/include/module.modulemap | |
| parent | 0b58b617998b79a765b54f88fbe90ca2798b3d3e (diff) | |
| download | zig-70e935db5bc16e5a7144dd0de3176d53dd892301.tar.gz zig-70e935db5bc16e5a7144dd0de3176d53dd892301.zip | |
translate-c: fix botched merge conflict
Previous commit failed to correctly solve the translate-c merge
conflict; this commit fixes it.
Diffstat (limited to 'lib/libcxx/include/module.modulemap')
0 files changed, 0 insertions, 0 deletions