No commit message

App-Fair · Dec 11, 2022 · ed108d9 · ed108d9
1 parent b71ca08
commit ed108d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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