From 88ea8b988a90105b46ac7dd1e53dc8c99de3880c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Apr 2016 20:12:53 +0000
Subject: [PATCH 1/1] Testing branches and merges.

---
 WEB-INF/lib/common.lib.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 905f10d1..4fa43777 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -26,13 +26,8 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-	/**
-	 * @return unknown
-	 * @param file unknown
-	 * @param version = "" unknown
-	 * @desc Loads a class
-	 */
-	function import($class_name) {
+// import() function loads a class.
+function import($class_name) {
 	    $libs = array(
 			dirname($_SERVER["SCRIPT_FILENAME"]),
 			LIBRARY_DIR
@@ -61,7 +56,7 @@
 
 		print '<br><b>load_class: error loading file "'.$filename.'"</b>';
 		die();
-	}
+}
 
 	// The mu_sort function is used to sort a multi-dimensional array.
 	// It looks like the code example is taken from the PHP manual http://ca2.php.net/manual/en/function.sort.php
-- 
2.20.1