Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 32805200B16 for ; Mon, 20 Jun 2016 22:25:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 315AF160A26; Mon, 20 Jun 2016 20:25:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1217B160A71 for ; Mon, 20 Jun 2016 22:25:23 +0200 (CEST) Received: (qmail 41171 invoked by uid 500); 20 Jun 2016 20:25:23 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 40650 invoked by uid 99); 20 Jun 2016 20:25:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2016 20:25:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3DAEED30E; Mon, 20 Jun 2016 20:25:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Mon, 20 Jun 2016 20:25:39 -0000 Message-Id: <40a1cef617624d00924b0d16bbab2337@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [18/18] airavata git commit: fixing merge conflicts archived-at: Mon, 20 Jun 2016 20:25:25 -0000 fixing merge conflicts Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c3ca6814 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c3ca6814 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c3ca6814 Branch: refs/heads/develop Commit: c3ca681449bbf5ff4b3b937a2ca48284373f4395 Parents: 36afbe6 0f962e7 Author: scnakandala Authored: Mon Jun 20 16:25:06 2016 -0400 Committer: scnakandala Committed: Mon Jun 20 16:25:06 2016 -0400 ---------------------------------------------------------------------- README | 1 - 1 file changed, 1 deletion(-) ----------------------------------------------------------------------