added gitattributes and driver ours
This commit is contained in:
1 parent
500d23b117
commit
22e5afeb3f
1 file changed
+1
@@ -0,0 +1 @@
|
||||
package.json merge=ours
|
||||
Reference in new issue
Block a user