From commits-return-11607-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Tue Aug 18 07:41:50 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 73A7A180652 for ; Tue, 18 Aug 2020 09:41:50 +0200 (CEST) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 92029124391 for ; Tue, 18 Aug 2020 07:41:49 +0000 (UTC) Received: (qmail 4955 invoked by uid 500); 18 Aug 2020 07:41:49 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 4942 invoked by uid 99); 18 Aug 2020 07:41:49 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Aug 2020 07:41:49 +0000 From: =?utf-8?q?GitBox?= To: commits@fineract.apache.org Subject: =?utf-8?q?=5BGitHub=5D_=5Bfineract=5D_Charulathakarthikeyan_commented_on_pul?= =?utf-8?q?l_request_=231113=3A_Need_an_option_to_filter_provisioning_entrie?= =?utf-8?q?s_by_date=2C_Fineract-462?= Message-ID: <159773650906.32230.1538478353946266281.asfpy@gitbox.apache.org> Date: Tue, 18 Aug 2020 07:41:49 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit In-Reply-To: References: Charulathakarthikeyan commented on pull request #1113: URL: https://github.com/apache/fineract/pull/1113#issuecomment-675314439 Hi, I solved the conflict , occurred in one API which is "ProvisioningEntriesApiResource" on Jul 15, 2020 and made my commit on that day . On Thu, Aug 13, 2020 at 10:59 PM edcable wrote: > @Charulathakarthikeyan Have > you been able to address the merge conflicts? I sent an email to your > colleagues as well. > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > , or > unsubscribe > > . > -- *Regards ,* *Charulatha Karthikeyan * *Software Developer |* Habile technologies www.habiletechnologies.com | (m) : +918939798772 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org