diff mbox

openbsc[master]: TEST: branch with conflict, newest commit on branch (doesn't...

Message ID gerrit.1464688509152.I8d8d1aab5006f36a0e553e782b854b6954972fa5@gerrit.osmocom.org
State New
Headers show

Commit Message

gerrit-no-reply@lists.osmocom.org May 31, 2016, 9:55 a.m. UTC 
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

Comments

gerrit-no-reply@lists.osmocom.org May 31, 2016, 11:47 a.m. UTC | #1 
Neels Hofmeyr has abandoned this change.

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


Abandoned
diff mbox

Patch

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>