diff --git a/.gitattributes b/.gitattributes index 5b6b22eaf..90a9f7949 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,3 +6,5 @@ launcher-package/src/windows/sbt text eol=lf **/contraband-scala/**/* -diff merge=ours **/contraband-scala/**/* linguist-generated=true **/contraband-scala/**/* diff + +*.contra linguist-language=graphql