From ed108d9bc2c9feb7360ef7c72709f443d7e0721b Mon Sep 17 00:00:00 2001
From: appfairz <appfairz@appfair.net>
Date: Sun, 11 Dec 2022 16:37:57 -0500
Subject: [PATCH]

---
 App.yml          | 1 -
 appfair.xcconfig | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/App.yml b/App.yml
index 333bf0690b68..7bacc4236b4d 100644
--- a/App.yml
+++ b/App.yml
@@ -32,7 +32,6 @@ markets:
 # Pages / Jekyll configuration:
 remote_theme: "appfair/fairapp-theme"
 
-<<<<<<< HEAD
 plugins:
   - jekyll-remote-theme
   - jekyll-seo-tag
diff --git a/appfair.xcconfig b/appfair.xcconfig
index 99aaec32d185..f43534962ac5 100644
--- a/appfair.xcconfig
+++ b/appfair.xcconfig
@@ -7,10 +7,10 @@ PRODUCT_NAME = App Fair
 PRODUCT_BUNDLE_IDENTIFIER = app.App-Fair
 
 // The semantic version for the app matching the git tag for the release
-MARKETING_VERSION = 0.8.134
+MARKETING_VERSION = 0.8.135
 
 // The monotonically increasing number specifying the internal app version
-CURRENT_PROJECT_VERSION = 957
+CURRENT_PROJECT_VERSION = 959
 
 // The category of the app should be one of: public.app-category.business, developer-tools, education, entertainment, finance, games, graphics-design, healthcare-fitness, lifestyle, medical, music, news, photography, productivity, reference, social-networking, sports, travel, utilities, video, weather
 APP_CATEGORY = public.app-category.utilities