From patchwork Tue May 31 09:55:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gerrit-no-reply@lists.osmocom.org X-Patchwork-Id: 628102 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [IPv6:2a01:4f8:191:444b::2:7]) by ozlabs.org (Postfix) with ESMTP id 3rJpkm6sVDz9s36 for ; Tue, 31 May 2016 19:55:12 +1000 (AEST) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 7BBE0223E9; Tue, 31 May 2016 09:55:11 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from 127.0.1.12 (unknown [127.0.1.12]) by lists.osmocom.org (Postfix) with ESMTPA id 4E84A223D1; Tue, 31 May 2016 09:55:09 +0000 (UTC) Date: Tue, 31 May 2016 09:55:09 +0000 From: Neels Hofmeyr Message-ID: X-Gerrit-MessageType: newchange Subject: [PATCH] openbsc[master]: TEST: branch with conflict, newest commit on branch (doesn't... X-Gerrit-Change-Id: I8d8d1aab5006f36a0e553e782b854b6954972fa5 X-Gerrit-ChangeURL: X-Gerrit-Commit: f2e7aeeafad5cc32332b8e7fa51a1f50420a0baf MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/2.12.2-31-gb331dbd-dirty X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB, OsmoCSCN" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: nhofmeyr@sysmocom.de Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" 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 #include