[Astrospaces-commits] SF.net SVN: astrospaces: [73] trunk/config.php

[<p3...@us...>]

Revision: 73
          http://astrospaces.svn.sourceforge.net/astrospaces/?rev=73&view=rev
Author:   p3net
Date:     2007-07-30 20:06:58 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
What did you do to my config file *slap* 

Modified Paths:
--------------
    trunk/config.php

Modified: trunk/config.php
===================================================================
--- trunk/config.php	2007-07-31 03:05:24 UTC (rev 72)
+++ trunk/config.php	2007-07-31 03:06:58 UTC (rev 73)
@@ -1,3 +1,43 @@
+<<<<<<< .mine
+<?php
+/* These settings are autogenerated by AstroSPACES
+   do not change them unless you know what you are
+   doing!
+*/
+define('AS_DB_TYPE',   'mysql');
+define('AS_DB_PREFIX', 'as_');
+define('AS_DB_HOST',   'localhost');
+define('AS_DB_SCHEMA', 'schema');
+define('AS_DB_USER',   'user');
+define('AS_DB_PASS',   'pass');
+
+define('AS_EXT',  '.php');
+define('AS_LANG', 'en-us');
+
+define('AS_LOC_URL',    'http://localhost/');
+define('AS_LOC_DIRECT', 'C:/path/to/astrospaces/');
+
+/* These settings are constants and must NOT
+   be altered. Doing so will prevent AstroSPACES
+   from functioning.
+*/
+define('AS_TBL_USER',     AS_DB_PREFIX.'user');
+define('AS_TBL_BLOG',     AS_DB_PREFIX.'blog');
+define('AS_TBL_BLOG_CMT', AS_DB_PREFIX.'blog_comments');
+define('AS_TBL_COMMENTS', AS_DB_PREFIX.'comments');
+define('AS_TBL_FRIEND',   AS_DB_PREFIX.'friends');
+define('AS_TBL_IMG',      AS_DB_PREFIX.'images');
+define('AS_TBL_IMG_CMT',  AS_DB_PREFIX.'image_comments');
+define('AS_TBL_ACTION',   AS_DB_PREFIX.'actions');
+define('AS_TBL_CMT',      AS_DB_PREFIX.'comments');
+define('AS_TBL_SESSION',  AS_DB_PREFIX.'sessions');
+define('AS_TBL_PM',       AS_DB_PREFIX.'private_messages');
+
+define('AS_DIR_TPL', 'template/');
+define('AS_TPL',     AS_LOC_URL.AS_DIR_TPL.'default/');
+
+
+=======
 <?php
 /* These settings are autogenerated by AstroSPACES
    do not change them unless if you have instructions
@@ -36,4 +76,5 @@
 define('AS_TPL',     AS_LOC_URL.AS_DIR_TPL.'default/');
 
 
+>>>>>>> .r71
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.