[Magellancms-cvs] magellan/defs general.def,1.17,1.18

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv7204/defs

Modified Files:
	general.def 
Log Message:
Solved conflicts.


Index: general.def
===================================================================
RCS file: /cvsroot/magellancms/magellan/defs/general.def,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** general.def	12 Mar 2003 14:02:54 -0000	1.17
--- general.def	12 Mar 2003 14:18:46 -0000	1.18
***************
*** 19,22 ****
--- 19,24 ----
  MODULE_SUBMODULES  = web users,free fields
  
+ MODULE_SUBMODULES  = web users,free fields
+ 
  MODULE_AUTHOR        = Solarix