Error when I try to add new customer with current CVS tree

[Ben Leibig]

Use of bare << to mean <<"" is deprecated at
/home/httpd/html/freeside/edit/cust
_main.cgi line 3.
In string, @voicenet now must be written as \@voicenet at
/home/httpd/html/frees
ide/edit/cust_main.cgi line 3, near "$
>>>>>>> 1.17
#
# Usage: cust_main.cgi custnum
#        http://server.name/path/cust_main.cgi?custnum
#
# ivan at voicenet"
In string, @sisd now must be written as \@sisd at
/home/httpd/html/freeside/edit
/cust_main.cgi line 3, near "}
# ivan at sisd"
In string, @maxbaud now must be written as \@maxbaud at
/home/httpd/html/freesid
e/edit/cust_main.cgi line 3, near "@maxbaud"
Use of bare << to mean <<"" is deprecated at
/home/httpd/html/freeside/edit/cust
_main.cgi line 94.
In string, @agents now must be written as \@agents at
/home/httpd/html/freeside/
edit/cust_main.cgi line 94, near "$p1 @agents"
In string, @invoicing_list now must be written as \@invoicing_list at
/home/http
d/html/freeside/edit/cust_main.cgi line 94, near "$fax @invoicing_list"
Unquoted string "cgi" may clash with future reserved word at
/home/httpd/html/fr
eeside/edit/cust_main.cgi line 113.
"use" not allowed in expression at
/home/httpd/html/freeside/edit/cust_main.cgi
line 113, at end of line
syntax error at /home/httpd/html/freeside/edit/cust_main.cgi line 113, near
"cgi
  #for misplaced logic below
  use FS::pkg_svc"
BEGIN not safe after errors--compilation aborted at
/home/httpd/html/freeside/ed
it/cust_main.cgi line 114.
[Wed Aug 11 03:18:36 1999] [error] [client 207.174.180.50] Premature end of
scri
pt headers: /home/httpd/html/freeside/edit/cust_main.cgi