From e9bf0956b9718ff507d996c64c95b01e135d0df2 Mon Sep 17 00:00:00 2001
From: Gerhard Jungwirth <gjungwirth@sipwise.com>
Date: Mon, 10 Jun 2013 17:49:54 +0200
Subject: [PATCH] fix mistaken diff garbage

---
 lib/NGCP/Panel/Controller/Contract.pm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/Contract.pm b/lib/NGCP/Panel/Controller/Contract.pm
index b21efede71..547a682a83 100644
--- a/lib/NGCP/Panel/Controller/Contract.pm
+++ b/lib/NGCP/Panel/Controller/Contract.pm
@@ -199,8 +199,6 @@ sub peering_ajax :Chained('peering_list') :PathPart('ajax') :Args(0) {
     $c->detach( $c->view("JSON") );
 }
 
-<<<<<<< HEAD
-=======
 __PACKAGE__->meta->make_immutable;
 
 1;
@@ -258,7 +256,6 @@ Display contracts through F<contract/list.tt> template. Use L</peering_ajax> as
 
 Similar to L</ajax>. Only select contracts, where billing.product is of class "sippeering".
 
->>>>>>> Implement Create/Show/Update/Delete of Contracts
 =head1 AUTHOR
 
 Andreas Granig,,,