From 63a9e99a5913264385e457cb3a8d66de96f639d0 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 11 Apr 2016 09:53:58 +0200 Subject: [PATCH] Message-Model conflict --- .../models/message/{message_model.php => message_model_old.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename application/models/message/{message_model.php => message_model_old.php} (100%) diff --git a/application/models/message/message_model.php b/application/models/message/message_model_old.php similarity index 100% rename from application/models/message/message_model.php rename to application/models/message/message_model_old.php