Update .gitmodules

changed gitmodules to merge rather than rebase
TrustedComputingGroup · Feb 21, 2024 · bcf9e6b · bcf9e6b
1 parent 16510b6
commit bcf9e6b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -2,4 +2,4 @@
 	path = draft-ietf-rats-corim
 	url = https://github.com/ietf-rats-wg/draft-ietf-rats-corim
 	branch = main
-	update = rebase
+	update = merge