Projects >> social >>c36bdc672e02aba134ef643e24a140182f310903

Chunk
Conflicting content 
 */
package org.exoplatform.social.core.space;

<<<<<<< HEAD
import org.exoplatform.social.core.search.Sorting;
=======
import java.util.List;

import org.exoplatform.social.core.space.model.Space;
>>>>>>> 1d45ca678f2e5ebf232825d20dce770e1f857c23

/**
 * @author hoatle (hoatlevan at gmail dot com)
Solution content 
 */
package org.exoplatform.social.core.space;

import org.exoplatform.social.core.search.Sorting;
import java.util.List;

import org.exoplatform.social.core.space.model.Space;

/**
 * @author hoatle (hoatlevan at gmail dot com)
File
SpaceFilter.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    if (filter != null) {
      this.firstCharacterOfSpaceName = filter.getFirstCharacterOfSpaceName();
      this.spaceNameSearchCondition = filter.getSpaceNameSearchCondition();
<<<<<<< HEAD
      this.sorting = filter.getSorting();
=======
      this.appId = filter.getAppId();
>>>>>>> 1d45ca678f2e5ebf232825d20dce770e1f857c23
    }
    this.type = type;
  }
Solution content 
    if (filter != null) {
      this.firstCharacterOfSpaceName = filter.getFirstCharacterOfSpaceName();
      this.spaceNameSearchCondition = filter.getSpaceNameSearchCondition();
      this.sorting = filter.getSorting();
      this.appId = filter.getAppId();
    }
    this.type = type;
  }
File
SpaceFilterKey.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation