From 555cf63d63ccef5a73f8a54e9ddfa4f2d48203b9 Mon Sep 17 00:00:00 2001
From: Brent Woodruff <brent@fprimex.com>
Date: Mon, 4 May 2015 22:46:11 -0400
Subject: [PATCH] settle a patch collision

---
 api_gen/patch.hc_article_sort_order | 2 +-
 api_gen/patch.hc_articles_locale    | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/api_gen/patch.hc_article_sort_order b/api_gen/patch.hc_article_sort_order
index da21467..b924307 100644
--- a/api_gen/patch.hc_article_sort_order
+++ b/api_gen/patch.hc_article_sort_order
@@ -6,7 +6,7 @@ diff -r -u developer.zendesk.com.cleaned/rest_api/docs/help_center/articles deve
         query string parameters.
        </p>
 -      <pre>GET /api/v2/help_center/en-us/articles.json?sort_by=updated_at&amp;sort;_order=asc
-+      <pre>GET /api/v2/help_center/en-us/articles.json?sort_by=updated_at&amp;sort_order=asc
++      <pre>GET /api/v2/help_center/{locale}/articles.json?sort_by=updated_at&amp;sort_order=asc
  </pre>
        <p>
         The
diff --git a/api_gen/patch.hc_articles_locale b/api_gen/patch.hc_articles_locale
index 9c34539..5c357f7 100644
--- a/api_gen/patch.hc_articles_locale
+++ b/api_gen/patch.hc_articles_locale
@@ -1,15 +1,6 @@
 diff -r -u developer.zendesk.com.cleaned/rest_api/docs/help_center/articles developer.zendesk.com.hc_articles_en-us/rest_api/docs/help_center/articles
 --- developer.zendesk.com.cleaned/rest_api/docs/help_center/articles	2015-05-04 16:28:55.000000000 -0400
 +++ developer.zendesk.com.hc_articles_en-us/rest_api/docs/help_center/articles	2015-05-04 22:36:06.000000000 -0400
-@@ -807,7 +807,7 @@
-        </code>
-        query string parameters.
-       </p>
--      <pre>GET /api/v2/help_center/en-us/articles.json?sort_by=updated_at&amp;sort;_order=asc
-+      <pre>GET /api/v2/help_center/{locale}/articles.json?sort_by=updated_at&amp;sort;_order=asc
- </pre>
-       <p>
-        The
 @@ -879,7 +879,7 @@
        </p>
        <p>