Skip to content

Commit

Permalink
Merge pull request #3019 from quintel/beccus
Browse files Browse the repository at this point in the history
Implement BECCUS in the ETM
  • Loading branch information
mabijkerk authored Mar 25, 2024
2 parents fe9acfd + 74cb57d commit 35aff66
Show file tree
Hide file tree
Showing 1,089 changed files with 14,116 additions and 1,144 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem 'rake'

group :development, :test do
gem 'roo'
gem 'atlas', ref: 'd5c84b5', github: 'quintel/atlas'
gem 'atlas', ref: 'cdb74be', github: 'quintel/atlas'
end

group :test do
Expand Down
24 changes: 11 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/quintel/atlas.git
revision: d5c84b505494c92f816624f8b30b4b47941ff75d
ref: d5c84b5
revision: cdb74be0ed878ecfd83a98b3528c538f6aa47bec
ref: cdb74be
specs:
atlas (1.0.0)
activemodel (>= 7)
Expand Down Expand Up @@ -31,9 +31,9 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activemodel (7.1.3)
activesupport (= 7.1.3)
activesupport (7.1.3)
activemodel (7.1.3.2)
activesupport (= 7.1.3.2)
activesupport (7.1.3.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -48,25 +48,24 @@ GEM
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
base64 (0.2.0)
bigdecimal (3.1.6)
bigdecimal (3.1.7)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
csv (3.2.8)
csv (3.3.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.3)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
equalizer (0.0.11)
gpgme (2.0.23)
gpgme (2.0.24)
mini_portile2 (~> 2.7)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
mini_portile2 (2.8.2)
minitest (5.21.2)
minitest (5.22.3)
mutex_m (0.2.0)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
Expand Down Expand Up @@ -94,7 +93,6 @@ GEM
rspec-core (>= 2, < 4, != 2.12.0)
ruby-graphviz (1.2.5)
rexml
ruby2_keywords (0.0.5)
rubyzip (1.3.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand Down
Loading

0 comments on commit 35aff66

Please sign in to comment.