From cc1f9780eaa6e6db656491d696e2df2a2a64ba83 Mon Sep 17 00:00:00 2001
From: Julian R <56316686+julianmrodri@users.noreply.github.com>
Date: Thu, 19 Oct 2023 12:53:02 -0300
Subject: [PATCH 1/3] update version

---
 contracts/mixins/Versioned.sol              | 2 +-
 contracts/plugins/assets/VersionedAsset.sol | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol
index 54c5f75da0..c70c7a8857 100644
--- a/contracts/mixins/Versioned.sol
+++ b/contracts/mixins/Versioned.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.19;
 import "../interfaces/IVersioned.sol";
 
 // This value should be updated on each release
-string constant VERSION = "3.0.0";
+string constant VERSION = "3.1.0";
 
 /**
  * @title Versioned
diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol
index f3fc5e30a3..b36945769d 100644
--- a/contracts/plugins/assets/VersionedAsset.sol
+++ b/contracts/plugins/assets/VersionedAsset.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.19;
 import "../../interfaces/IVersioned.sol";
 
 // This value should be updated on each release
-string constant ASSET_VERSION = "3.0.0";
+string constant ASSET_VERSION = "3.1.0";
 
 /**
  * @title VersionedAsset

From 9983d779aa5d2969f368057c8962fb7035650c88 Mon Sep 17 00:00:00 2001
From: Julian R <56316686+julianmrodri@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:16:36 -0300
Subject: [PATCH 2/3] fix tests

---
 test/fixtures.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures.ts b/test/fixtures.ts
index 5bf2201390..366e08f5bd 100644
--- a/test/fixtures.ts
+++ b/test/fixtures.ts
@@ -78,7 +78,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error
 export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually
 
 // This will have to be updated on each release
-export const VERSION = '3.0.0'
+export const VERSION = '3.1.0'
 
 export type Collateral =
   | FiatCollateral

From 3df68bc453306ebd7d3235e9169f55c8d499cbfa Mon Sep 17 00:00:00 2001
From: Julian R <56316686+julianmrodri@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:16:19 -0300
Subject: [PATCH 3/3] fix tests

---
 test/fixtures.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/fixtures.ts b/test/fixtures.ts
index a5730b13c3..6244d68ff3 100644
--- a/test/fixtures.ts
+++ b/test/fixtures.ts
@@ -80,11 +80,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error
 export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually
 
 // This will have to be updated on each release
-<<<<<<< HEAD
 export const VERSION = '3.1.0'
-=======
-export const VERSION = '3.0.1'
->>>>>>> 3.1.0
 
 export type Collateral =
   | FiatCollateral