Merge pull request #2968 from Automattic/fix/version-merge-conflicts

Varia children: resolve merge conflicts

balasana/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.2.14
-=======
 Version: 1.2.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

balasana/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.2.14
-=======
 Version: 1.2.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

balasana/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.2.14
-=======
 Version: 1.2.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

brompton/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.16
-=======
 Version: 1.3.15
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

brompton/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.16
-=======
 Version: 1.3.15
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

brompton/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.16
-=======
 Version: 1.3.15
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

coutoire/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.14
-=======
 Version: 1.3.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

coutoire/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.14
-=======
 Version: 1.3.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

coutoire/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.14
-=======
 Version: 1.3.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

exford/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online presence as striking and stylish as your business with Exford.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.14
-=======
 Version: 1.4.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

exford/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online presence as striking and stylish as your business with Exford.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.14
-=======
 Version: 1.4.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

exford/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online presence as striking and stylish as your business with Exford.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.14
-=======
 Version: 1.4.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

leven/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: A colorful, typography driven, Gutenberg-ready theme meant to grab the attention of potential customers and market or sell products to them.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.13
-=======
 Version: 1.3.12
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

leven/style-rtl.css

@@ -6,11 +6,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: A colorful, typography driven, Gutenberg-ready theme meant to grab the attention of potential customers and market or sell products to them.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.13
-=======
 Version: 1.3.12
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

leven/style.css

@@ -6,11 +6,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: A colorful, typography driven, Gutenberg-ready theme meant to grab the attention of potential customers and market or sell products to them.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.13
-=======
 Version: 1.3.12
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

maywood/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Maywood is a refined theme designed for restaurants and food-related businesses seeking a modern look.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.16
-=======
 Version: 1.4.15
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

maywood/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Maywood is a refined theme designed for restaurants and food-related businesses seeking a modern look.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.16
-=======
 Version: 1.4.15
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

maywood/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Maywood is a refined theme designed for restaurants and food-related businesses seeking a modern look.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.16
-=======
 Version: 1.4.15
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

redhill/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A simple theme with clean typography, created with entrepreneurs and small business owners in mind.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.13
-=======
 Version: 1.4.12
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

redhill/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A simple theme with clean typography, created with entrepreneurs and small business owners in mind.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.13
-=======
 Version: 1.4.12
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

redhill/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A simple theme with clean typography, created with entrepreneurs and small business owners in mind.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.13
-=======
 Version: 1.4.12
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

rockfield/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Rockfield is a refined theme designed for restaurants and food-related businesses seeking a classic, elegant look.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.12
-=======
 Version: 1.3.11
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

rockfield/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Rockfield is a refined theme designed for restaurants and food-related businesses seeking a classic, elegant look.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.12
-=======
 Version: 1.3.11
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

rockfield/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Rockfield is a refined theme designed for restaurants and food-related businesses seeking a classic, elegant look.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.12
-=======
 Version: 1.3.11
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

shawburn/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Shawburn is the ideal choice for creating an online presence for your business.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.14
-=======
 Version: 1.3.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

shawburn/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Shawburn is the ideal choice for creating an online presence for your business.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.14
-=======
 Version: 1.3.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

shawburn/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Shawburn is the ideal choice for creating an online presence for your business.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.14
-=======
 Version: 1.3.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

stow/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A bold and clean theme - Stow is the ideal choice for creating an online presence for your business.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.14
-=======
 Version: 1.4.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

stow/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A bold and clean theme - Stow is the ideal choice for creating an online presence for your business.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.14
-=======
 Version: 1.4.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

stow/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A bold and clean theme - Stow is the ideal choice for creating an online presence for your business.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.4.14
-=======
 Version: 1.4.13
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

stratford/sass/style-child-theme.scss

@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Stratford is the perfect design for your business or educational institutes online presence. Highlight your products and services, Stratford is versatile enough to be your personal blog too.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.12
-=======
 Version: 1.3.11
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

stratford/style-rtl.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Stratford is the perfect design for your business or educational institutes online presence. Highlight your products and services, Stratford is versatile enough to be your personal blog too.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.12
-=======
 Version: 1.3.11
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

stratford/style.css

@@ -6,11 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Stratford is the perfect design for your business or educational institutes online presence. Highlight your products and services, Stratford is versatile enough to be your personal blog too.
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.3.12
-=======
 Version: 1.3.11
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia