From 147c51f6f9d94a84020e837d27db68c16994f05e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 10 May 2016 22:39:54 +0300
Subject: [PATCH] Clean up diffs between branches

---
 app/Http/routes.php                     | 1 +
 composer.lock                           | 2 +-
 resources/views/public/header.blade.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 5b383c0822c8..15f0b247a144 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /*
 |--------------------------------------------------------------------------
 | Application Routes
diff --git a/composer.lock b/composer.lock
index 606338333d7c..4dd6f3db14ed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9900,4 +9900,4 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": []
-}
+}
\ No newline at end of file
diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php
index 4f753b4a8d3e..017570e5f919 100644
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@@ -189,4 +189,4 @@
 
 
 
-  @stop
+  @stop
\ No newline at end of file