Planet Ubuntu

Merge lp:~lamont/planet-ubuntu/production-20150625 into lp:planet-ubuntu

  1. production-20150625
  2. Merge into trunk
Proposed by LaMont Jones
Status: Merged
Merged at revision: 33
Proposed branch: lp:~lamont/planet-ubuntu/production-20150625
Merge into: lp:planet-ubuntu
Diff against target: 26 lines (+6/-0) (has conflicts)
1 file modified
index.html.tmpl (+6/-0)
Text conflict in index.html.tmpl
To merge this branch: bzr merge lp:~lamont/planet-ubuntu/production-20150625
Reviewer Review Type Date Requested Status
Canonical Website Editors Pending
Review via email: mp+263031@code.launchpad.net

Description of the change

This is the actual running branch in production right now, and need to get back into trunk. see also cRT#82347

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

There is an unresolved conflict in this diff. The source being delivered from http://planet.ubuntu.com/ is the TREE version. Are you sure this is the code running in prod?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'index.html.tmpl'
2--- index.html.tmpl 2015-04-28 21:48:10 +0000
3+++ index.html.tmpl 2015-06-25 20:35:11 +0000
4@@ -6,6 +6,7 @@
5 <meta name="robots" content="index,follow" />
6 <link rel="stylesheet" type="text/css" href="css/style.css" />
7 <link rel="alternate" type="application/rss+xml" href="<TMPL_VAR link>rss20.xml" title="<TMPL_VAR name> RSS" />
8+<<<<<<< TREE
9 <link rel="shortcut icon" href="//assets.ubuntu.com/sites/ubuntu/latest/u/img/favicon.ico" />
10
11 <script src="//assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/yui-combined.min.js"></script>
12@@ -13,9 +14,14 @@
13 <link rel="stylesheet" type="text/css" media="all" href="//fonts.googleapis.com/css?family=Ubuntu:300,400,400italic" />
14 <link rel="stylesheet" type="text/css" media="screen" href="//assets.ubuntu.com/sites/ubuntu/latest/u/css/global.css" />
15 <script src="//assets.ubuntu.com/sites/ubuntu/latest/u/js/global.js"></script>
16+=======
17+ <link rel="shortcut icon" href="<TMPL_VAR link>images/favicon.ico" />
18+ <link rel="stylesheet" href="stacktack.min.css" />
19+>>>>>>> MERGE-SOURCE
20 </head>
21
22 <body class="blog">
23+<script type="text/javascript" src="stacktack.min.js"></script>
24 <div id="wrapper" class="hfeed">
25
26 <div id="header">

Subscribers

People subscribed via source and target branches