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 044B6200AE4 for ; Thu, 26 May 2016 07:27:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 032A6160A2E; Thu, 26 May 2016 05:27:52 +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 441FC160A29 for ; Thu, 26 May 2016 07:27:51 +0200 (CEST) Received: (qmail 17572 invoked by uid 500); 26 May 2016 05:27:50 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 17561 invoked by uid 99); 26 May 2016 05:27:50 -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; Thu, 26 May 2016 05:27:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BC6E1DFC8C; Thu, 26 May 2016 05:27:49 +0000 (UTC) From: anshul1886 To: dev@cloudstack.apache.org Reply-To: dev@cloudstack.apache.org References: In-Reply-To: Subject: [GitHub] cloudstack pull request: Made the adding new keyboard language sup... Content-Type: text/plain Message-Id: <20160526052749.BC6E1DFC8C@git1-us-west.apache.org> Date: Thu, 26 May 2016 05:27:49 +0000 (UTC) archived-at: Thu, 26 May 2016 05:27:52 -0000 Github user anshul1886 commented on the pull request: https://github.com/apache/cloudstack/pull/669#issuecomment-221780994 @swill Resolved the merge conflicts. They were because of import statements. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---