gitattributes not needed
This commit is contained in:
1 parent
e73ecc8747
commit
35f914f938
1 file changed
+1
-1
+1
-1
@@ -1 +1 @@
|
|||||||
package.json merge=ours
|
#package.json merge=ours
|
||||||
Reference in new issue
Block a user