Merge #639

639: move submodule entry to a place where it will not conflict r=pietroalbini a=tshepang An upstream change resulted in a conflict, due to rust-lang/rust#125166. Co-authored-by: Tshepang Mbambo <[email protected]>
ferrocene · May 21, 2024 · 6f132f8 · 6f132f8
2 parents 87e8e5b + 06c30f0
commit 6f132f8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "ferrocene/doc/specification/shared"]
     path = ferrocene/doc/specification/shared
     url = https://github.com/ferrocene/sphinx-shared-resources.git
+[submodule "ferrocene/tools/flip-link"]
+	path = ferrocene/tools/flip-link
+	url = https://github.com/knurling-rs/flip-link
 [submodule "src/doc/nomicon"]
 	path = src/doc/nomicon
 	url = https://github.com/rust-lang/nomicon.git
@@ -46,6 +49,3 @@
 	path = library/backtrace
 	url = https://github.com/rust-lang/backtrace-rs.git
 	shallow = true
-[submodule "ferrocene/tools/flip-link"]
-	path = ferrocene/tools/flip-link
-	url = https://github.com/knurling-rs/flip-link