[incubator-datalab] 01/02: [DATALAB-2091]: fixed missed merge conflict

[lf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 33fc5b3520ca20212f42fd692002edb50e90a384
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Mar 12 16:09:05 2021 +0200

    [DATALAB-2091]: fixed missed merge conflict
---
 .../properties/DynamicChangeProperties.java        | 23 ----------------------
 1 file changed, 23 deletions(-)

diff --git a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java
index 7d74fa1..5ae76bd 100644
--- a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java
+++ b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java
@@ -1,27 +1,4 @@
-<<<<<<< HEAD:services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, 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.
- */
-
-package com.epam.datalab.backendapi.service.impl;
-=======
 package com.epam.datalab.properties;
->>>>>>> develop:services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java
 
 import com.epam.datalab.auth.UserInfo;
 import com.epam.datalab.constants.ServiceConsts;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org