mirror of
https://github.com/storytold/placeholder-artcraft.git
synced 2026-10-09 00:09:55 +00:00
Brandon Thomas
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
|