[DEECo] [d3scomp/JDEECo] 630ac5: resolving two conflicts from previous commit..

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 630ac51fc25238586bba3e54861d0e5c9cf63a9c
      https://github.com/d3scomp/JDEECo/commit/630ac51fc25238586bba3e54861d0e5c9cf63a9c
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/ClassDEECoObjectProvider.java

  Log Message:
  -----------
  resolving two conflicts from previous commit..