diff --git a/content/pages/checkout.blade.php b/content/pages/checkout.blade.php index a62c32e..064edd5 100644 --- a/content/pages/checkout.blade.php +++ b/content/pages/checkout.blade.php @@ -5,7 +5,6 @@ @stop @section('content')
-<<<<<<< HEAD @if(true)
@@ -75,7 +74,6 @@
-=======