v0.3.6

1c2514c0 · Daniel Mendler · Jon Wood · f46e0d38 · 1c2514c0
Commit 1c2514c0 authored Mar 24, 2021 by Daniel Mendler Committed by Jon Wood Mar 24, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

lib/mimemagic/version.rb
+4 -0

No files found.
--- a/lib/mimemagic/version.rb
+++ b/lib/mimemagic/version.rb
 class MimeMagic
  # MimeMagic version string
  # @api public
+<<<<<<< HEAD
  VERSION = '0.4.0'
+=======
+  VERSION = '0.3.6'
+>>>>>>> v0.3.6
 end