cbeck88
diff --git a/‎.gitattributes
+1 b/‎.gitattributes
+1
diff --git a/‎.gitconfig
+3 b/‎.gitconfig
+3
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
@@ -0,0 +1 @@
+Cargo.lock merge=theirs
@@ -0,0 +1,3 @@
+[merge "theirs"]
+	name = "Always accept theirs"
+	driver = false
@@ -0,0 +1 @@
+/target
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[merge "theirs"]`
	`2`	`+ name = "Always accept theirs"`
	`3`	`+ driver = false`