Skip to content

Commit

Permalink
Merge pull request #1275 from ApexAI/iox-#1126-add-replace-conflicts-…
Browse files Browse the repository at this point in the history
…tag-hoofs-package

Iox #1126 add replace conflicts tag hoofs package
  • Loading branch information
dkroenke authored Mar 11, 2022
2 parents 4ded2f7 + 1f7e86f commit f030ed9
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions iceoryx_hoofs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<depend>acl</depend>
<depend>libatomic</depend>

<conflict>iceoryx_utils</conflict>
<replace>iceoryx_utils</replace>

<doc_depend>doxygen</doc_depend>

<export>
Expand Down

0 comments on commit f030ed9

Please sign in to comment.