diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-04-17 09:48:09 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-04-17 09:48:09 -0700 |
| commit | 06f92269d9fe378cfa2f00c958404a6e8df642ff (patch) | |
| tree | 9171a03cbd64f37b6b0c8271974f04e5042242fa /httemplate/view | |
| parent | 67065f306c08433774a1044bcd8e5d6254d752da (diff) | |
| parent | 7ce77a80cf98d1b97e8bcd942d03905902b9d653 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
httemplate/view/cust_main/packages/contact.html
Diffstat (limited to 'httemplate/view')
| -rw-r--r-- | httemplate/view/cust_main/packages/contact.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/httemplate/view/cust_main/packages/contact.html b/httemplate/view/cust_main/packages/contact.html index 5f47cf706..c3b161b70 100644 --- a/httemplate/view/cust_main/packages/contact.html +++ b/httemplate/view/cust_main/packages/contact.html @@ -13,7 +13,6 @@ %# % } </FONT> % } - <%init> my $conf = new FS::Conf; |