# Auto-generated files - always use local branch version during merges
packages/protocol/gas-reports/* merge=ours
packages/protocol/layout/* merge=ours