.gitattributes 55 B

12
  1. src/config/api.js merge=ours
  2. config/proxy.ts merge=ours