mirror of
https://github.com/neondatabase/neon.git
synced 2025-12-22 21:59:59 +00:00
5 lines
216 B
Plaintext
5 lines
216 B
Plaintext
# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks
|
|
# Cargo.
|
|
# Also do not check out the file as CRLF on Windows, as that's what hakari needs.
|
|
Cargo.toml merge=binary -crlf
|