Clean up common.pl - messed up somehow in master

karengaia · Aug 12, 2012 · bb65c04 · bb65c04
1 parent 6841b3d
commit bb65c04
Showing 1 changed file with 0 additions and 18 deletions.
diff --git 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&#64;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'}       = "<html xmlns=\"http://www.w3.org/1999/xhtml\" >\n<head>\n";
  $GLVARS{'std_meta'}          = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />\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];