[ice-build] [eclipse/ice] ccc255: Removed merge conflict text.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[ice-build] [eclipse/ice] ccc255: Removed merge conflict text.

From: GitHub <noreply@xxxxxxxxxx>
Date: Mon, 04 May 2015 15:32:29 -0700
Delivered-to: ice-build@xxxxxxxxxxx
Domainkey-signature: a=rsa-sha1; c=nofws; d=github.com; s=mailo; q=dns; h=Date: From: Reply-To: To: Message-Id: Subject: Mime-Version: Content-Type: Content-Transfer-Encoding: Sender; b=InVw8vovF/pIckhyPsK1p64XBdFWeDx3FLQlCZaQY8bIXBSkLrB53j4j6JeAVQoESicKMW sNgbhL7dvceWpcuTZMd0Ekb7n42RlMMgYIAD559OL29b/4vcJA6pPSVsuqyhjtdtgvH0MNsa scG36zIwI6OI3p9hszxfapf2FxnLw=
List-archive: <https://dev.eclipse.org/mailman/private/ice-build>
List-help: <mailto:ice-build-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/ice-build>, <mailto:ice-build-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/ice-build>, <mailto:ice-build-request@eclipse.org?subject=unsubscribe>

  Branch: refs/heads/master
  Home:   https://github.com/eclipse/ice
  Commit: ccc25573d38f308c09f490d09d0a7499cd2f6eea
      https://github.com/eclipse/ice/commit/ccc25573d38f308c09f490d09d0a7499cd2f6eea
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-05-04 (Mon, 04 May 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java

  Log Message:
  -----------
  Removed merge conflict text.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>

Prev by Date: Re: [ice-build] [Hudson] Build failed in Hudson: ICE Build #4182
Next by Date: [ice-build] [Hudson] Hudson build is back to normal : ICE Build #4183
Previous by thread: [ice-build] [Hudson] Build failed in Hudson: ICE Build #4182
Next by thread: [ice-build] [Hudson] Build failed in Hudson: ICE Build #4315
Index(es):
- Date
- Thread

Breadcrumbs