From bb65c04a66ea6d5f6707b5af8ebc2812feb3283a Mon Sep 17 00:00:00 2001 From: Karen Pitts Date: Sat, 11 Aug 2012 21:11:46 -0700 Subject: [PATCH] Clean up common.pl - messed up somehow in master --- subdomains/www/cgi-bin/common.pl | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/subdomains/www/cgi-bin/common.pl b/subdomains/www/cgi-bin/common.pl index 84ac6d4..0a63e12 100755 --- a/subdomains/www/cgi-bin/common.pl +++ b/subdomains/www/cgi-bin/common.pl @@ -21,11 +21,7 @@ sub get_site_info $GLVARS{'contactEmail'} = "karen4329\@karengaia.net"; $GLVARS{'contactEmail_html'} = "karen4329@karengaia.net"; $GLVARS{'adminEmail'} = "karen4329\@karengaia.net"; -<<<<<<< HEAD - $GLVARS{'email_std_end'} = "karen4329\@karengaia.net"; -======= $GLVARS{'email_std_end'} = "Thank you.\n\n Karen Gaia Pitts,\n editor and publisher\n World Population Awareness\n 6610 Folsom Auburn Rd. Ste 5-4\n Folsom CA 95630-2146\n $adminEmail\n"; ->>>>>>> owner2 $GLVARS{'std_headtop'} = "\n\n"; $GLVARS{'std_meta'} = "\n"; $contactEmail = "karen4329\@karengaia.net"; @@ -337,20 +333,6 @@ sub trim } -<<<<<<< HEAD -### 460 DATA MANIPULATION - -sub trim -{ - my $string = shift; - $string =~ s/^\s+//; - $string =~ s/\s+$//; - return $string; -} - - -======= ->>>>>>> owner2 sub prep_for_regexp { local($datafield) = $_[0];