widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

SirVer has proposed merging lp:~widelands-dev/widelands/test_merge into lp:widelands.

Commit message:
This is a test branch to check a refactoring of bunnybot. Please ignore.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636

This is a test branch to check a refactoring of bunnybot. Please ignore.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/test_merge into lp:widelands.

=== modified file 'src/base/macros.h'
--- src/base/macros.h	2017-07-01 20:32:02 +0000
+++ src/base/macros.h	2017-08-06 21:16:27 +0000
@@ -17,6 +17,8 @@
  *
  */
 
+this is a syntax error.
+
 #ifndef WL_BASE_MACROS_H
 #define WL_BASE_MACROS_H