update

shilpa-khanal · shilpa-khanal · commit f233e99e42e3 · 2021-02-05T18:59:43.000Z
diff --git a/lib/avatax/version.rb b/lib/avatax/version.rb
@@ -1,3 +1,7 @@
 ﻿module AvaTax
+<<<<<<< HEAD
   VERSION = '21.1.1'.freeze unless defined?(::AvaTax::VERSION)
+=======
+  VERSION = '21.1.1'.freeze unless defined?(::AvaTax::VERSION)
+>>>>>>> ec31911d922a2f4b66e69fa4596b378361e4c675
 end
