From cf6e199bbed6bbccebf34ab72e1f476419ef8b2d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 18 Mar 2014 15:20:38 +0200 Subject: [PATCH] Merging conflicts --- app/views/about_us.blade.php | 4 ---- public/images/hero-bg-4.psd | Bin 17535412 -> 0 bytes 2 files changed, 4 deletions(-) delete mode 100644 public/images/hero-bg-4.psd diff --git a/app/views/about_us.blade.php b/app/views/about_us.blade.php index b1676688f605..68caa700259a 100644 --- a/app/views/about_us.blade.php +++ b/app/views/about_us.blade.php @@ -38,11 +38,7 @@