From 62bac18637e5a8d716cc45e3e34486f6a4c63ee2 Mon Sep 17 00:00:00 2001 From: Susan Steinman Date: Mon, 10 Jun 2024 15:29:37 -0400 Subject: [PATCH] Replace Bazel Skylib implementation of unittest.bzl with an alias to the version in rules_testing. --- tests/dicts_tests.bzl | 4 ---- tests/types_tests.bzl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/tests/dicts_tests.bzl b/tests/dicts_tests.bzl index a1d3b95..c4fcb9c 100644 --- a/tests/dicts_tests.bzl +++ b/tests/dicts_tests.bzl @@ -16,10 +16,6 @@ load("@rules_testing//lib:unittest.bzl", "asserts", "unittest") load("//lib:dicts.bzl", "dicts") -<<<<<<< HEAD -load("@rules_testing//lib:unittest.bzl", "asserts", "unittest") -======= ->>>>>>> a03e850 (Replace Bazel Skylib implementation of unittest.bzl with an alias to the version in rules_testing.) def _add_test(ctx): """Unit tests for dicts.add.""" diff --git a/tests/types_tests.bzl b/tests/types_tests.bzl index 7a7a672..37ef271 100644 --- a/tests/types_tests.bzl +++ b/tests/types_tests.bzl @@ -16,10 +16,6 @@ load("@rules_testing//lib:unittest.bzl", "asserts", "unittest") load("//lib:new_sets.bzl", "sets") load("//lib:types.bzl", "types") -<<<<<<< HEAD -load("@rules_testing//lib:unittest.bzl", "asserts", "unittest") -======= ->>>>>>> a03e850 (Replace Bazel Skylib implementation of unittest.bzl with an alias to the version in rules_testing.) def _a_function(): """A dummy function for testing."""