Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed merge conflict and typo

  • Loading branch information...
commit 4329b64c30910e43510da62132d515d2b1e0f9ca 1 parent c4e0cdd
@wryobservations wryobservations authored
Showing with 1 addition and 6 deletions.
  1. +1 −6 styleguide.html
View
7 styleguide.html
@@ -57,14 +57,9 @@
<h2>Guides</h2>
<p>Our guides are a set of related information about a specific topic (eg <a href "https://www.gov.uk/council-housing"> Council housing</a>) or life event (eg <a href "https://www.gov.uk/after-a-death"> After someone dies</a>). One guide has one or more related 'parts' - people can see the edges of a topic and choose to read the whole lot or simply home in on a specific element.</p>
<h2>Answers</h2>
-<<<<<<< HEAD
<p>Our answers assume prior knowledge of a subject and answer one specific need, eg <a href "National Minimum wage rates."></a> We answer the question only and don't crowd the answer with surplus information. We also use answers to address popular needs (eg <a href "Child Benefit rates"></a>). We go into <a href "https://www.gov.uk/child-benefit">detail on Child Benefit</a> in our guide.</p>
-
-=======
- <p>Our answers assume prior knowledge of a subject and answer one specific need, eg <a href "National Minimum wage rates."></a> We answer the question only and don't crowd the answer with surplus information. We also use answers to address popular needs (eg passport fees). We go into detail on [example] in a guide about the subject.</p>
->>>>>>> 757a393441e831c74642e5247a7d40190ceb6a59
<h2>Benefits and schemes</h2>
- <p>A swathe of our content is about money and other things you can get from government. Amongst the morass of information about these schemes, the user needs are always centred around 3 tasks: How much can I get? Am I eligible? How do I claim? Our 'Benefits and schemes' format allows us to design content around these tasks</p>
+ <p>A swathe of our content is about money and other things you can get from government. Amongst the morass of information about these schemes, the user needs are always centred around 3 tasks: How much can I get? Am I eligible? How do I claim? Our 'Benefits and schemes' format allows us to design content around these tasks.</p>
<h2>Services</h2>
<p>What can we say about this format, other than it lets us direct people to <a href="https://www.gov.uk/file-your-self-assessment-tax-return">find the quick do!</a></p>
</article>
Please sign in to comment.
Something went wrong with that request. Please try again.