Review at https://gerrit.osmocom.org/133

TEST: branch with conflict, newest commit on branch (doesn't conflict)

Change-Id: I8d8d1aab5006f36a0e553e782b854b6954972fa5 --- M openbsc/src/libmsc/mncc.c 1 file changed, 1 insertion(+), 0 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/33/133/1

diff --git a/openbsc/src/libmsc/mncc.c b/openbsc/src/libmsc/mncc.c index 8110ead..b8468e5 100644 --- a/openbsc/src/libmsc/mncc.c +++ b/openbsc/src/libmsc/mncc.c @@ -20,6 +20,7 @@ * */

+/* BAR CAR PAR test 123 */

#include <stdio.h> #include <stdlib.h>