conflicts resolved

razorpay · Jan 30, 2025 · d56a24a · d56a24a
2 parents 4a01a50 + 8d7d7e9
commit d56a24a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/scraper.yml b/.github/workflows/scraper.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: 3.1
           bundler-cache: true
       - name: Install scraper dependencies
         run: bundle install

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,18 @@ All notable changes to this project will be documented in this file. The format
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [UNRELEASED][unreleased]
-
 ## [2.0.40][2.0.40]
 ### Changed
 - Metadata updates
 
+## [2.0.39][2.0.39]
+### Changed
+- Metadata updates
+
+## [2.0.38][2.0.40]
+### Changed
+- Metadata updates
+
 ## [2.0.38][2.0.38]
 ### Changed
 - Metadata updates

diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "ifsc",
+<<<<<<< HEAD
   "version": "2.0.40",
+=======
+  "version": "2.0.39",
+>>>>>>> 8d7d7e9fe732e4dd56eac6aaab0268bf7afb1a02
   "description": "This is part of the IFSC toolset released by Razorpay. You can find more details about the entire release at [ifsc.razorpay.com](https://ifsc.razorpay.com). Includes only a validation library as of now.",
   "main": "src/node/index.js",
   "directories": {

diff --git a/src/IFSC.json b/src/IFSC.json