fixing broken pushes

Gemfile.lock

@@ -42,11 +42,7 @@ GIT
 PATH
   remote: .
   specs:
-<<<<<<< Updated upstream
     origen (0.60.15)
-=======
-    origen (0.60.16)
->>>>>>> Stashed changes
       activesupport (~> 4.1)
       bundler (> 1.7)
       coderay (~> 1.1)
@@ -85,6 +81,7 @@ GEM
       ast (~> 2)
       origen (>= 0.2.3)
       sexpistol (~> 0.0)
+    bigdecimal (3.1.8)
     builder (3.3.0)
     byebug (11.1.3)
     coderay (1.1.3)
@@ -107,7 +104,7 @@ GEM
     gems (0.8.3)
     highline (1.7.10)
     http-accept (1.7.0)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
@@ -119,27 +116,26 @@ GEM
       rexml
     loco (0.0.7)
     method_source (1.1.0)
-    mime-types (3.4.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2024.0702)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
     minitest (5.24.1)
+    mize (0.5.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     nanoc (3.7.5)
       cri (~> 2.3)
     net-ldap (0.19.0)
     netrc (0.11.0)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     origen_debuggers (0.6.1)
       origen (>= 0.2.6)
       origen_testers (>= 0.5.0)
     origen_doc_helpers (0.8.6)
       origen (>= 0.7.15)
-    origen_jtag (0.22.2)
+    origen_jtag (0.22.3)
       origen (~> 0.7, >= 0.7.35)
       origen_testers (>= 0.13.2)
     origen_stil (0.3.0)
@@ -170,7 +166,7 @@ GEM
       netrc (~> 0.8)
     rexml (3.3.2)
       strscan
-    ripper-tags (0.9.1)
+    ripper-tags (1.0.2)
     rodf (1.2.0)
       builder (>= 3.0)
       rubyzip (>= 1.0)
@@ -211,24 +207,26 @@ GEM
     simplecov-html (0.10.2)
     strscan (3.1.0)
     sync (0.5.0)
-    term-ansicolor (1.7.1)
+    term-ansicolor (1.10.4)
+      mize (~> 0.5)
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tins (1.32.1)
+    tins (1.33.0)
+      bigdecimal
       sync
     treetop (1.6.12)
       polyglot (~> 0.3)
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.2)
+    unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
     yard (0.9.36)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   byebug (~> 11)
@@ -246,4 +244,4 @@ DEPENDENCIES
   ripper-tags
 
 BUNDLED WITH
-   2.4.10
+   2.2.33

config/version.rb

@@ -1,11 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 60
-<<<<<<< Updated upstream
-  BUGFIX = 15
-=======
-  BUGFIX = 16
->>>>>>> Stashed changes
+  BUGFIX = 14
   DEV = nil
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
 end