From 913f10716a327cb76fb863ceeaf7ea45f88ca05f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EA=B9=80=EC=88=98=EC=A7=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Mon, 22 Oct 2018 17:12:48 +0900 Subject: [PATCH] Remove conflict helper comments in FeatureLoggingLayer.h (#3282) This commit removes conflict helper comments in `FeatureLoggingLayer.h` Signed-off-by: sjsujinkim --- runtimes/pure_arm_compute/src/internal/layers/FeatureLoggingLayer.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/runtimes/pure_arm_compute/src/internal/layers/FeatureLoggingLayer.h b/runtimes/pure_arm_compute/src/internal/layers/FeatureLoggingLayer.h index 8576345..83ae7c1 100644 --- a/runtimes/pure_arm_compute/src/internal/layers/FeatureLoggingLayer.h +++ b/runtimes/pure_arm_compute/src/internal/layers/FeatureLoggingLayer.h @@ -39,21 +39,18 @@ class FeatureLoggingLayer : public ::arm_compute::IFunction { public: -<<<<<<< HEAD FeatureLoggingLayer(void) : _tag(""), _target(nullptr) { // DO NOTHING } public: -======= /** * @brief Configure the layer * @param[in] tag Text tag for this layer * @param[in] target The feature tensor to be printed * @return N/A */ ->>>>>>> 796f8027... [doxygen] Add comments for Added layers (#2968) void configure(const std::string &tag, ::arm_compute::ITensor *target) { _tag = tag; -- 2.7.4