Fix rebase issue

Signed-off-by: thepetk <[email protected]>
devfile · May 31, 2024 · b1e1a6a · b1e1a6a
1 parent a682e6b
commit b1e1a6a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/integration/Dockerfile b/tests/integration/Dockerfile
@@ -12,11 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<<<<<<< HEAD
-FROM golang:1.19-alpine@sha256:0ec0646e208ea58e5d29e558e39f2e59fccf39b7bda306cb53bbaff91919eca5
-=======
 FROM golang:1.21-alpine@sha256:3f8e3ad3e7c128d29ac3004ac8314967c5ddbfa5bfa7caa59b0de493fc01686a
->>>>>>> 9b9d99c6 (Bump up integration generator server and ci go version)
 
 WORKDIR /registry-test