/*
 * Copyright 2013-2016 consulo.io
 *
 * Licensed 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.intellij.diff.comparison;

/**
 * @author VISTALL
 * @since 18-Aug-16
 */
class MergeResolveUtil {
  public static CharSequence tryResolveConflict(CharSequence leftText, CharSequence baseText, CharSequence rightText) {
    // nothing, we don't have kotlin, and don't want it
    // TODO [VISTALL] convert it from kotlin
    return null;
  }
}