merge and resolve conflict

rapid7 · Feb 26, 2019 · fdd401a · fdd401a
2 parents 3bcb04a + e4dc1df
commit fdd401a
Show file tree

Hide file tree

Showing 3 changed files with 615 additions and 660 deletions.
diff --git a/lib/recog/version.rb b/lib/recog/version.rb
@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.1.46'
+  VERSION = '2.2.0'
 end