From b3439d9ab7d911649a35e7abc81e8d912f5a1f84 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 22:41:30 +0300 Subject: [PATCH] Clean up diffs between branches --- resources/views/header.blade.php | 2 +- resources/views/public/header.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index e3bdf5f5be28..7b4fe014e71f 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -812,4 +812,4 @@

 

-@stop \ No newline at end of file +@stop diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php index 017570e5f919..4f753b4a8d3e 100644 --- a/resources/views/public/header.blade.php +++ b/resources/views/public/header.blade.php @@ -189,4 +189,4 @@ - @stop \ No newline at end of file + @stop