[mxbb-commits] core/modules/mx_phpbb2blocks/templates/_core _core.cfg, 1.4, 1.5

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26895

Modified Files:
	_core.cfg 
Log Message:
Weird conflict. I do not know how? Nevermind, updated.

Index: _core.cfg
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/_core/_core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** _core.cfg	17 Feb 2008 13:35:23 -0000	1.4
--- _core.cfg	27 Feb 2008 21:30:30 -0000	1.5
***************
*** 10,23 ****
  
  //
- // **      Configuration file for subSilver template       **
- //
- // **         copyright (C) 2001 The phpBB Group           **
- // **             Created by subBlue design                **
- // **                  www.subBlue.com                     **
- //
- // **    subSilver dev. forum: www.subSky.com/phpBB2/      **
- //
- // $Id$
- //
  // Please note that to enable support of different languages
  // the {LANG} place holder is available. This will be replaced
--- 10,13 ----
***************
*** 28,33 ****
  //
  
- $mx_template_name = '_core';
- 
  //
  // Do not alter this line!
--- 18,21 ----