resolve conflicts

adiwg · Dec 20, 2024 · bde037c · bde037c
1 parent 081367c
commit bde037c
Show file tree

Hide file tree

Showing 5 changed files with 1,299 additions and 0 deletions.
diff --git a/Gemfile.lock.bak b/Gemfile.lock.bak
@@ -0,0 +1,36 @@
+PATH
+  remote: .
+  specs:
+<<<<<<< HEAD
+    adiwg-mdjson_schemas (2.10.0)
+=======
+    adiwg-mdjson_schemas (2.10.1)
+>>>>>>> develop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    adiwg-mdcodes (2.10.1)
+      json (~> 2.0)
+    json (2.9.1)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    minitest (5.22.2)
+    public_suffix (5.0.4)
+    rake (13.1.0)
+
+PLATFORMS
+  arm64-darwin-22
+
+DEPENDENCIES
+  adiwg-mdcodes (= 2.10.1)
+  adiwg-mdjson_schemas!
+  bundler (~> 2)
+  json-schema (~> 2.8.1)
+  minitest (~> 5)
+  rake
+
+BUNDLED WITH
+   2.4.21
diff --git a/lib/adiwg/mdjson_schemas/version.rb.bak b/lib/adiwg/mdjson_schemas/version.rb.bak
@@ -0,0 +1,10 @@
+module ADIWG
+    module MdjsonSchemas
+        # Current schema version number
+<<<<<<< HEAD
+        VERSION = "2.10.0"
+=======
+        VERSION = "2.10.1"
+>>>>>>> develop
+    end
+end