Skip to content

Commit 3a50297

Browse files
committed
fix(autoware_lanelet2_map_visualizer): bug in remaining conflicts
Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp>
1 parent 5157753 commit 3a50297

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

map/autoware_lanelet2_map_visualizer/package.xml

-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<<<<<<<< HEAD:common/autoware_geography_utils/package.xml
5-
<name>autoware_geography_utils</name>
6-
<version>0.39.0</version>
7-
<description>The autoware_geography_utils package</description>
8-
========
94
<name>autoware_lanelet2_map_visualizer</name>
105
<version>0.40.0</version>
116
<description>The autoware_lanelet2_map_visualizer package</description>
12-
>>>>>>>> d741026d8824c8240d2945eeb942e5dd9e6dc363:map/autoware_lanelet2_map_visualizer/package.xml
137
<maintainer email="yamato.ando@tier4.jp">Yamato Ando</maintainer>
148
<maintainer email="ryu.yamamoto@tier4.jp">Ryu Yamamoto</maintainer>
159
<maintainer email="masahiro.sakamoto@tier4.jp">Masahiro Sakamoto</maintainer>

0 commit comments

Comments
 (0)