From c375c1dcd9913795422710c7996c830df74efdd3 Mon Sep 17 00:00:00 2001
From: jumagura <juangura@gmail.com>
Date: Wed, 15 Mar 2023 21:43:32 -0400
Subject: [PATCH] DEV: Merge main

---
 plugin.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugin.rb b/plugin.rb
index 41d9270d..c18e79d9 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-<<<<<<< HEAD
-# version: 2.1.5
-=======
 # version: 2.2.9
->>>>>>> main
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: development@pavilion.tech