From 8f76f66859973d440a5b17e878865d36ec99ac60 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 26 Nov 2018 12:06:43 -0500
Subject: [PATCH] Fixed merge conflicts

---
 readme.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 1f10cb7f..aa3e09f3 100755
--- a/readme.txt
+++ b/readme.txt
@@ -66,7 +66,8 @@ There is of course much more to this.
 (none)
 
 == Changelog ==
-= (pending) =
+= 2.10.46 =
+* Moved session startup from adminHooks.php to index.php to ensure there's always a session started.
 * Fixed member listings not using selected sort order setting past first page.
 * Smarty Templates updated to version 3.1.33 due to use of "each()" that is being depricated in PHP.
 
-- 
2.17.1