Merge branch '51-stable' into 52-stable

enebo · enebo · commit a1f33b6252a2 · 2019-04-10T15:54:48.000-05:00
diff --git a/lib/arjdbc/version.rb b/lib/arjdbc/version.rb
@@ -1,3 +1,7 @@
 module ArJdbc
+<<<<<<< HEAD
   VERSION = '52.1'
+=======
+  VERSION = '51.3'
+>>>>>>> 51-stable
 end
