diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-08-23 23:18:36 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-08-23 23:18:36 +0200 |
| commit | 38b418b7d63783fa0c7b920b7de6a1f6930fc7cb (patch) | |
| tree | 3d2a95c3c74130c31ee3e21d540ccae0504ee17c /tpl/layout.twig | |
| parent | d29b3e5f9e195b99d3891acd8537f8f4680e430f (diff) | |
| parent | fa5f9764ae370d6eb5efd6b05bf8e257aae9899d (diff) | |
| download | wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.tar.gz wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.tar.zst wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.zip | |
resolve conflicts
Diffstat (limited to 'tpl/layout.twig')
| -rw-r--r-- | tpl/layout.twig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tpl/layout.twig b/tpl/layout.twig index 22d08fca..07ca231c 100644 --- a/tpl/layout.twig +++ b/tpl/layout.twig | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]--> | 2 | <!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]--> |
| 3 | <!--[if lte IE 7]> <html class="no-js ie7 ie67 ie678" lang="en"> <![endif]--> | 3 | <!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]--> |
| 4 | <!--[if IE 8]> <html class="no-js ie8 ie678" lang="en"> <![endif]--> | 4 | <!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]--> |
| 5 | <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> | 5 | <!--[if gt IE 8]><html class="no-js" lang="en"><![endif]--> |
| 6 | <html> | 6 | <html> |
| 7 | <head> | 7 | <head> |
| 8 | <meta name="viewport" content="initial-scale=1.0"> | 8 | <meta name="viewport" content="initial-scale=1.0"> |