From c3438b79c8e2ab4dc49b9cc96873c9ff5b51f92c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Sep 2018 15:39:11 +0200
Subject: [PATCH] Fix merge

---
 htdocs/loan/class/loanschedule.class.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index be27fff9894..80341e8df0c 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -372,20 +372,16 @@ class LoanSchedule extends CommonObject
 		}
 	}
 
-<<<<<<< HEAD
-    // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	function calc_mens($capital,$rate,$nbterm)
-=======
-    /**
-     * Calculate mensuality
-     *
-     * @param   double  $capital        Capital
-     * @param   double  $rate           rate
-     * @param   int     $nbterm         nb term
-     * @return  double                  mensuality
-     */
-    function calc_mens($capital, $rate, $nbterm)
->>>>>>> upstream/develop
+	/**
+	 * Calculate mensuality
+	 *
+	 * @param   double  $capital        Capital
+	 * @param   double  $rate           rate
+	 * @param   int     $nbterm         nb term
+	 * @return  double                  mensuality
+	 */
+	// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+	function calc_mens($capital, $rate, $nbterm)
 	{
 		$result='';