Fixed merge conflict

Merge branch 'beta'

Conflicts:

	src/include/functions_common.php
This commit is contained in:
Andre Lorbach 2008-07-25 14:53:35 +02:00
commit 98f1e92b8f

View File

@ -1037,6 +1037,4 @@ function SaveGeneralSettingsIntoDB()
// Extra Fields
WriteConfigValue( "DefaultViewsID", true );
WriteConfigValue( "DefaultSourceID", true );
}
?>
}