DS: fixing merge conflicts

saasquatch · Dec 28, 2022 · 1ef18ef · 1ef18ef
1 parent bb73850
commit 1ef18ef
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 19 deletions.
diff --git a/content/guides/commonPitfallsBestPractices.md b/content/guides/commonPitfallsBestPractices.md
@@ -4,11 +4,7 @@ highlights: Many common Referral SaaSquatch integration problems can be easily a
 slug: bestpractices/common-pitfalls
 sectionType: guide
 template: article.html
-<<<<<<< HEAD
-robots : noindex, nofollow
-=======
 date: '2019-11-18'
->>>>>>> production
 ---
 
 ### Using the wrong account_id

diff --git a/content/guides/zuora.md b/content/guides/zuora.md
@@ -4,9 +4,6 @@ highlights: In order to respect Zuora's privacy policies Zuora integration docum
 slug: developer/zuora
 sectionType: guide
 template: article.html
-<<<<<<< HEAD
 robots : noindex, nofollow
-=======
 date: '2019-11-18'
->>>>>>> production
 ---
diff --git a/content/theming/assets.html b/content/theming/assets.html
@@ -4,11 +4,8 @@
 slug: themes/assets
 sectionType: themes
 template: article.html
-<<<<<<< HEAD
 robots : noindex, nofollow
-=======
 date: '2019-11-18'
->>>>>>> production
 ---
 
 <div class="row-fluid">

diff --git a/content/theming/standard.html b/content/theming/standard.html
@@ -4,11 +4,8 @@
 slug: themes/standard
 sectionType: themes
 template: article.html
-<<<<<<< HEAD
 robots : noindex, nofollow
-=======
 date: '2019-11-18'
->>>>>>> production
 ---
 
 

diff --git a/content/theming/templates.md b/content/theming/templates.md
@@ -4,11 +4,8 @@ highlights: Referral SaaSquatch templates use **Handlebars**. Handlebars let you
 slug: themes/templates
 sectionType: themes
 template: article.html
-<<<<<<< HEAD
 robots : noindex, nofollow
-=======
 date: '2019-11-18'
->>>>>>> production
 ---
 
 Templates are easy to use. Here's an example template:

diff --git a/content/theming/widgetjs.md b/content/theming/widgetjs.md
@@ -4,11 +4,8 @@ highlights: Publicly available widget JS API at ```window.widget.rpc = widget.rp
 slug: themes/widgetjs
 sectionType: themes
 template: article.html
-<<<<<<< HEAD
 robots : noindex, nofollows
-=======
 date: '2019-11-18'
->>>>>>> production
 ---
 
 ### Methods