Fix: Remove unneeded resources

zendframework · Feb 24, 2015 · 2444a53 · 2444a53
1 parent 1cd1f8e
commit 2444a53
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 293 deletions.
diff --git a/module/Application/public/css/slide.css b/module/Application/public/css/slide.css
diff --git a/module/Application/public/img/tab/Thumbs.db b/module/Application/public/img/tab/Thumbs.db
diff --git a/module/Application/public/img/tab/bg.jpg b/module/Application/public/img/tab/bg.jpg
diff --git a/module/Application/public/img/tab/bt_close.png b/module/Application/public/img/tab/bt_close.png
diff --git a/module/Application/public/img/tab/bt_login.png b/module/Application/public/img/tab/bt_login.png
diff --git a/module/Application/public/img/tab/bt_open.png b/module/Application/public/img/tab/bt_open.png
diff --git a/module/Application/public/img/tab/bt_register.png b/module/Application/public/img/tab/bt_register.png
diff --git a/module/Application/public/img/tab/tab_b.png b/module/Application/public/img/tab/tab_b.png
diff --git a/module/Application/public/img/tab/tab_l.png b/module/Application/public/img/tab/tab_l.png
diff --git a/module/Application/public/img/tab/tab_m.png b/module/Application/public/img/tab/tab_m.png
diff --git a/module/Application/public/img/tab/tab_r.png b/module/Application/public/img/tab/tab_r.png
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -11,8 +11,12 @@
 
         <?php $this->headLink(['rel' => 'shortcut icon', 'href' => $this->basePath('favicon.ico')]); ?>
         <?php $this->headLink()->appendStylesheet($this->basePath('css/bootstrap.min.css')); ?>
+<<<<<<< Updated upstream
         <?php $this->headLink()->appendStylesheet($this->basePath('css/style.css?201502241620')); ?>
         <?php $this->headLink()->appendStylesheet($this->basePath('css/slide.css')); ?>
+=======
+        <?php $this->headLink()->appendStylesheet($this->basePath('css/style.css?201502201415')); ?>
+>>>>>>> Stashed changes
         <?php $this->headLink()->appendAlternate($this->url('feed'), 'application/rss+xml', 'RSS Feed for ZF2 Modules'); ?>
         <?php echo $this->headLink(); ?>
     </head>