.

nolag · nolag · commit 4c704ac1f2d9 · 2026-05-08T13:44:46.000-04:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,4 @@
 [submodule "submodules/chainlink-protos"]
 	path = submodules/chainlink-protos
 	url = https://github.com/smartcontractkit/chainlink-protos.git
-<<<<<<< HEAD
-	branch = rtinianov_tee
-=======
-	branch = rtinianov_restricted
->>>>>>> rtinianov_restricted
+	branch = rtinianov_teeAndRestrictions
diff --git a/packages/cre-sdk/Makefile b/packages/cre-sdk/Makefile
@@ -1,4 +1,4 @@
-COMMON_VERSION ?= d5bcc3e02a945415e69c3a22710a8d9cfe048f77
+COMMON_VERSION ?= 40f1f69d33c12d9a65bc21bd0dc189c150be2409
 MODULE := github.com/smartcontractkit/chainlink-common
 TEST_PATTERN ?= ^TestStandard
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-COMMON_VERSION ?= d5bcc3e02a945415e69c3a22710a8d9cfe048f77`
	`1`	`+COMMON_VERSION ?= 40f1f69d33c12d9a65bc21bd0dc189c150be2409`
`2`	`2`	`MODULE := github.com/smartcontractkit/chainlink-common`
`3`	`3`	`TEST_PATTERN ?= ^TestStandard`
`4`	`4`