Index: branches/dev/html/mobile/require.php
===================================================================
--- branches/dev/html/mobile/require.php	(revision 11872)
+++ branches/dev/html/mobile/require.php	(revision 11879)
@@ -8,5 +8,5 @@
  */
 $include_dir = realpath(dirname( __FILE__));
-require_once($include_dir . "/../../data/conf/mobile_conf.php");
+require_once($include_dir . "/../../data/conf/conf.php");
 require_once($include_dir . "/../../data/include/module.inc");
 require_once($include_dir . "/../../data/include/mobile.inc");
Index: branches/dev/data/script/receive_kara_mail.php
===================================================================
--- branches/dev/data/script/receive_kara_mail.php	(revision 11872)
+++ branches/dev/data/script/receive_kara_mail.php	(revision 11879)
@@ -5,5 +5,5 @@
  */
 
-require_once dirname(__FILE__) . '/../conf/mobile_conf.php';
+require_once dirname(__FILE__) . '/../conf/conf.php';
 require_once DATA_PATH . '/include/php_ini.inc';
 require_once DATA_PATH . '/include/mobile.inc';
Index: branches/dev/data/script/send_kara_mail.php
===================================================================
--- branches/dev/data/script/send_kara_mail.php	(revision 11872)
+++ branches/dev/data/script/send_kara_mail.php	(revision 11879)
@@ -5,5 +5,5 @@
  */
 
-require_once dirname(__FILE__) . '/../conf/mobile_conf.php';
+require_once dirname(__FILE__) . '/../conf/conf.php';
 
 if ($argc != 4) {
Index: branches/dev/data/conf/conf.php
===================================================================
--- branches/dev/data/conf/conf.php	(revision 11849)
+++ branches/dev/data/conf/conf.php	(revision 11879)
@@ -11,4 +11,5 @@
 require_once($CONF_PHP_PATH ."/../install.inc");
 require_once($CONF_PHP_PATH ."/core.php" );
+require_once($CONF_PHP_PATH ."/mobile_conf.php" );
 
 //--------------------------------------------------------------------------------------------------------
Index: branches/dev/data/conf/mobile_conf.php
===================================================================
--- branches/dev/data/conf/mobile_conf.php	(revision 11876)
+++ branches/dev/data/conf/mobile_conf.php	(revision 11879)
@@ -72,6 +72,4 @@
 
 //--------------------------------------------------------------------------------------------------------
-// conf.php ¤«¤é»Ä¤ê¤ÎÀßÄê¤òÆɤ߹þ¤à¡£
-require_once(DATA_PATH . 'conf/conf.php');
 
 ?>