Test cleanup after merge to 7.10.2

This commit is contained in:
Colin Kuskie 2010-10-27 18:42:43 -07:00
parent a067cbbe70
commit a6a10d976a
6 changed files with 26 additions and 17 deletions

View file

@ -206,7 +206,6 @@ $output = WebGUI::Content::Asset::dispatch( $session );
is $output, 'www_view one', 'an empty URL returns the default asset';
$session->setting->set('defaultPage', $originalDefaultPage);
<<<<<<< HEAD
#----------------------------------------------------------------------------
# 304 Content Not Modified response