[ice-build] [eclipse/ice] 84aa5a: Thought I removed the merge conflict t

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

[ice-build] [eclipse/ice] 84aa5a: Thought I removed the merge conflict text in my la...

From: GitHub <noreply@xxxxxxxxxx>
Date: Mon, 18 May 2015 15:41:37 -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=wpfFtKfD9bF3chxshZv7BBD0WxvPQp+GjpnaDmZahoEvTn0F5vmretQWG9V0qg/UFh45BX g4+3t5JVfwpLEb1EppIw9Vhf6dsxkUxXKw9IlA2wY0I4ALngnABXV0OBAjmloUSjktEDKERb ZRH10GrgYBkvBKPpWMfreB77MaCzk=
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: 84aa5a15d1ee645e3ed5a3d89206c8a58e94c394
      https://github.com/eclipse/ice/commit/84aa5a15d1ee645e3ed5a3d89206c8a58e94c394
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java

  Log Message:
  -----------
  Thought I removed the merge conflict text in my last commit but I
didn't.

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

Prev by Date: [ice-build] [eclipse/ice] b7a707: Committing work so far before I go rummaging aroun...
Next by Date: [ice-build] [eclipse/ice]
Previous by thread: [ice-build] [eclipse/ice] 306688: Updated documentation.
Next by thread: [ice-build] [eclipse/ice] 41046e: Updated documentation.
Index(es):
- Date
- Thread

Breadcrumbs