Skip to content
Snippets Groups Projects
Commit ed5215dc authored by Craig Tiller's avatar Craig Tiller
Browse files

fix merge

parent 7ad2d0b4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
grpc-build-system.bzl
+ 0
− 3
View file @ ed5215dc
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
def grpc_cc_library(name, srcs = [], hdrs = [], deps = [], standalone = False, language = "C++"):
=======
# #
# This is for the gRPC build system. This isn't intended to be used outsite of # This is for the gRPC build system. This isn't intended to be used outsite of
# the BUILD file for gRPC. It contains the mapping for the template system we # the BUILD file for gRPC. It contains the mapping for the template system we
...@@ -37,7 +35,6 @@ def grpc_cc_library(name, srcs = [], hdrs = [], deps = [], standalone = False, l ...@@ -37,7 +35,6 @@ def grpc_cc_library(name, srcs = [], hdrs = [], deps = [], standalone = False, l
# #
def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [], external_deps = [], deps = [], standalone = False, language = "C++"): def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [], external_deps = [], deps = [], standalone = False, language = "C++"):
>>>>>>> e8dbd8aaae5d813546abe4956361c4e6512d8c88
copts = [] copts = []
if language == "C": if language == "C":
copts = ["-std=c99"] copts = ["-std=c99"]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment