Merging conflicts

2024-11-10 05:02:36 +01:00 · 2014-03-18 15:20:38 +02:00 · 2014-03-18 15:20:38 +02:00 · cf6e199bbe
commit cf6e199bbe
parent 45d38e8266
2 changed files with 0 additions and 4 deletions
--- a/app/views/about_us.blade.php
+++ b/app/views/about_us.blade.php
@ -38,11 +38,7 @@
  <div class="navbar" style="margin-bottom:0px">
    <div class="container">
      <div class="navbar-inner">
-<<<<<<< HEAD
-        <a class="brand" href="#"><img src=
-=======
        <a class="brand" href="/"><img src=
->>>>>>> upstream/master
          "images/invoiceninja-logo.png"></a>
          <ul class="navbar-list">
            <li>{{ link_to('about', 'About Us' ) }}</li>
--- a/public/images/hero-bg-4.psd
+++ b/public/images/hero-bg-4.psd