widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
 M  src/ai/defaultai.cc
 M  src/economy/expedition_bootstrap.cc
 M  src/economy/flag.cc
 M  src/economy/portdock.cc
 M  src/economy/test/test_routing.cc
 M  src/editor/editorinteractive.cc
 M  src/game_io/game_interactive_player_packet.cc
 M  src/game_io/game_preload_packet.cc
 M  src/graphic/animation.cc
 M  src/graphic/font_handler1.cc
 M  src/graphic/image_io.cc
 M  src/graphic/text/bidi.cc
 M  src/graphic/text/rendered_text.cc
 M  src/graphic/text/rt_render.cc
 M  src/graphic/text/sdl_ttf_font.cc
 M  src/graphic/text/test/render_richtext.cc
 M  src/io/filesystem/zip_filesystem.cc
 M  src/logic/editor_game_base.cc
 M  src/logic/map_objects/immovable.cc
 M  src/logic/map_objects/tribes/production_program.cc
 M  src/logic/map_objects/tribes/trainingsite.cc
 M  src/logic/map_objects/tribes/worker_descr.cc
 M  src/network/gamehost.cc
 M  src/network/network_lan_promotion.cc
 M  src/scripting/lua_map.cc
 M  src/third_party/eris/eris.c
 M  src/third_party/eris/lauxlib.c
 M  src/third_party/eris/loslib.c
 M  src/third_party/eris/lstrlib.c
 M  src/third_party/eris/lua.c
 M  src/third_party/eris/lvm.c
 M  src/third_party/minizip/unzip.cc
 M  src/ui_basic/window.cc
 M  src/wui/attack_box.cc
 M  src/wui/chatoverlay.cc
 M  src/wui/plot_area.cc
Text conflict in src/graphic/text/rt_render.cc
1 conflicts encountered.


-- 
https://code.launchpad.net/~widelands-dev/widelands/clang-tidy-round1/+merge/333560
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/clang-tidy-round1.