Update noetic/distribution.yaml

Co-authored-by: Chris Lalancette <[email protected]>
ros · Jul 24, 2024 · 9750c8b · 9750c8b
1 parent 4246de4
commit 9750c8b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/noetic/distribution.yaml b/noetic/distribution.yaml
@@ -94,10 +94,13 @@ repositories:
     doc:
       type: git
       url: https://github.com/analogdevicesinc/adi_tmc_coe.git
+<<<<<<< HEAD
       version: noetic
     source:
       type: git
       url: https://github.com/analogdevicesinc/adi_tmc_coe.git
+=======
+>>>>>>> 609a248f4 (Update noetic/distribution.yaml)
       version: noetic
     source:
       type: git