diff --git a/.gitattributes b/.gitattributes index b14e065..c4405d1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ -vision_test/ merge=ours -test/ merge=ours +/vision_test/ merge=ours +/test/ merge=ours -.gitattributes merge=ours -.gitignore merge=ours +/.gitattributes merge=ours +/.gitignore merge=ours