diff --git a/zjit/.gitattributes b/zjit/.gitattributes deleted file mode 100644 index 2750c4c626..0000000000 --- a/zjit/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -src/hir.rs merge=union -src/cruby_methods.rs merge=union -src/codegen.rs merge=union