diff --git a/.gitattributes b/.gitattributes index d00618408..d6ecd1fd2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -azure-pipelines.yml merge=ours \ No newline at end of file +azure-pipelines.yml merge=ours