Resolve merge conflicts

godaddy-wordpress · Jul 26, 2018 · 267eb5e · 267eb5e
2 parents 406448b + cc4e6fc
commit 267eb5e
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/.dev/docs/apigen/godaddy/config.neon b/.dev/docs/apigen/godaddy/config.neon
@@ -1,4 +1,4 @@
 name: "GoDaddy"
 
 options:
-	activeVersion: '1.8.4'
+	activeVersion: '1.8.5'
diff --git a/.dev/docs/sphinx/godaddy/layout.html b/.dev/docs/sphinx/godaddy/layout.html
@@ -149,7 +149,7 @@
                             <h2>
                                 <a href="https://godaddy.github.io/wp-primer-theme/documentation/index.html">
                                     <span class="glyph_range icon-submenu icon-submenu-cook">B</span>
-                                    Primer Theme v1.8.4 <strong>Documentation</strong>
+                                    Primer Theme v1.8.5 <strong>Documentation</strong>
                                 </a>
                             </h2>
                         </div>

diff --git a/.dev/sass/style.scss b/.dev/sass/style.scss
@@ -4,7 +4,7 @@
  * Author: GoDaddy
  * Author URI: https://www.godaddy.com/
  * Description: Primer is a powerful theme that brings clarity to your content in a fresh design.
- * Version: 1.8.4
+ * Version: 1.8.5
  * License: GPL-2.0
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: primer

diff --git a/functions.php b/functions.php
@@ -23,7 +23,7 @@
  *
  * @var string
  */
-define( 'PRIMER_VERSION', '1.8.4' );
+define( 'PRIMER_VERSION', '1.8.5' );
 
 /**
  * Minimum WordPress version required for Primer.
@@ -130,7 +130,7 @@
 /**
  * Load Gutenberg compatiblity.
  *
- * @since NEXT
+ * @since 1.8.5
  */
 require_once get_template_directory() . '/inc/compat/gutenberg.php';
 

diff --git a/inc/compat/gutenberg.php b/inc/compat/gutenberg.php
@@ -6,13 +6,13 @@
  * @subpackage Gutenberg
  * @category   Core
  * @author     GoDaddy
- * @since      NEXT
+ * @since      1.8.5
  */
 
 /**
  * Enable Gutenberg features.
  *
- * @since NEXT
+ * @since 1.8.5
  */
 function primer_gutenberg_theme_support() {
 
@@ -25,7 +25,7 @@ function primer_gutenberg_theme_support() {
 /**
  * Enqueue styles for Gutenberg editor.
  *
- * @since NEXT
+ * @since 1.8.5
  */
 function primer_gutenberg_editor_assets() {
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "primer",
   "title": "Primer",
   "description": "Primer is a powerful theme that brings clarity to your content in a fresh design. This is the parent for all themes in the GoDaddy Primer theme family.",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "author": "GoDaddy",
   "license": "GPL-2.0",
   "repository": "godaddy/wp-primer-theme",

diff --git a/readme.md b/readme.md
@@ -3,7 +3,7 @@
 **Tags:**              [custom-background](https://wordpress.org/themes/tags/custom-background/), [custom-colors](https://wordpress.org/themes/tags/custom-colors/), [custom-header](https://wordpress.org/themes/tags/custom-header/), [custom-menu](https://wordpress.org/themes/tags/custom-menu/), [editor-style](https://wordpress.org/themes/tags/editor-style/), [featured-images](https://wordpress.org/themes/tags/featured-images/), [flexible-header](https://wordpress.org/themes/tags/flexible-header/), [left-sidebar](https://wordpress.org/themes/tags/left-sidebar/), [one-column](https://wordpress.org/themes/tags/one-column/), [right-sidebar](https://wordpress.org/themes/tags/right-sidebar/), [rtl-language-support](https://wordpress.org/themes/tags/rtl-language-support/), [sticky-post](https://wordpress.org/themes/tags/sticky-post/), [threaded-comments](https://wordpress.org/themes/tags/threaded-comments/), [three-columns](https://wordpress.org/themes/tags/three-columns/), [translation-ready](https://wordpress.org/themes/tags/translation-ready/), [two-columns](https://wordpress.org/themes/tags/two-columns/)  
 **Requires at least:** 4.4  
 **Tested up to:**      4.9  
-**Stable tag:**        1.8.4  
+**Stable tag:**        1.8.5  
 **License:**           GPL-2.0  
 **License URI:**       https://www.gnu.org/licenses/gpl-2.0.html  
 

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors:      godaddy, fjarrett, jonathanbardo, eherman24
 Tags:              custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, flexible-header, left-sidebar, one-column, right-sidebar, rtl-language-support, sticky-post, threaded-comments, three-columns, translation-ready, two-columns
 Requires at least: 4.4
 Tested up to:      4.9
-Stable tag:        1.8.4
+Stable tag:        1.8.5
 License:           GPL-2.0
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 

diff --git a/style-rtl.css b/style-rtl.css
@@ -4,7 +4,7 @@
  * Author: GoDaddy
  * Author URI: https://www.godaddy.com/
  * Description: Primer is a powerful theme that brings clarity to your content in a fresh design.
- * Version: 1.8.4
+ * Version: 1.8.5
  * License: GPL-2.0
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: primer

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@
  * Author: GoDaddy
  * Author URI: https://www.godaddy.com/
  * Description: Primer is a powerful theme that brings clarity to your content in a fresh design.
- * Version: 1.8.4
+ * Version: 1.8.5
  * License: GPL-2.0
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: primer