Checking core structure...
compile_project:10: no matches found: *.in
rm -f calc-core.jar `find . -name \*.class`
(cd src; javac -encoding UTF-8 `find . -name \*.java`)
(cd src; jar cf ../calc-core.jar `find . -name \*.class -o -name \*.java`)
Checking manager interface structure...
rm -f calc-textui.jar `find . -name \*.class`
(cd src; javac -encoding UTF-8 -cp /usr/share/java/po-uilib.jar:/usr/share/java/calc-support.jar:../../calc-core/calc-core.jar `find . -name \*.java`)
./calc/textui/search/ShowValues.java:11: error: class, interface, or enum expected
<<<<<<< ShowValues.java
^
./calc/textui/search/ShowValues.java:15: error: class, interface, or enum expected
=======
^
./calc/textui/search/ShowValues.java:17: error: class, interface, or enum expected
>>>>>>> 1.2
^
./calc/textui/search/ShowValues.java:34: error: illegal start of type
<<<<<<< ShowValues.java
^
./calc/textui/search/ShowValues.java:34: error: ';' expected
<<<<<<< ShowValues.java
  ^
./calc/textui/search/ShowValues.java:34: error: illegal start of type
<<<<<<< ShowValues.java
    ^
./calc/textui/search/ShowValues.java:34: error: <identifier> expected
<<<<<<< ShowValues.java
      ^
./calc/textui/search/ShowValues.java:34: error: ';' expected
<<<<<<< ShowValues.java
       ^
./calc/textui/search/ShowValues.java:34: error: illegal start of type
<<<<<<< ShowValues.java
                  ^
./calc/textui/search/ShowValues.java:34: error: ';' expected
<<<<<<< ShowValues.java
                       ^
./calc/textui/search/ShowValues.java:40: error: illegal start of type
=======
^
./calc/textui/search/ShowValues.java:40: error: ';' expected
=======
  ^
./calc/textui/search/ShowValues.java:40: error: illegal start of type
=======
    ^
./calc/textui/search/ShowValues.java:40: error: <identifier> expected
=======
      ^
./calc/textui/search/ShowValues.java:40: error: ';' expected
=======
       ^
./calc/textui/search/ShowValues.java:45: error: illegal start of type
>>>>>>> 1.2
^
./calc/textui/search/ShowValues.java:45: error: ';' expected
>>>>>>> 1.2
   ^
./calc/textui/search/ShowValues.java:45: error: illegal start of type
>>>>>>> 1.2
      ^
./calc/textui/search/ShowValues.java:45: error: <identifier> expected
>>>>>>> 1.2
       ^
./calc/textui/search/ShowValues.java:45: error: ';' expected
>>>>>>> 1.2
           ^
./calc/textui/search/ShowValues.java:47: error: reached end of file while parsing
}
 ^
./calc/textui/search/ShowFunctions.java:11: error: class, interface, or enum expected
<<<<<<< ShowFunctions.java
^
./calc/textui/search/ShowFunctions.java:15: error: class, interface, or enum expected
=======
^
./calc/textui/search/ShowFunctions.java:17: error: class, interface, or enum expected
>>>>>>> 1.2
^
./calc/textui/search/ShowFunctions.java:34: error: illegal start of type
<<<<<<< ShowFunctions.java
^
./calc/textui/search/ShowFunctions.java:34: error: ';' expected
<<<<<<< ShowFunctions.java
  ^
./calc/textui/search/ShowFunctions.java:34: error: illegal start of type
<<<<<<< ShowFunctions.java
    ^
./calc/textui/search/ShowFunctions.java:34: error: <identifier> expected
<<<<<<< ShowFunctions.java
      ^
./calc/textui/search/ShowFunctions.java:34: error: ';' expected
<<<<<<< ShowFunctions.java
       ^
./calc/textui/search/ShowFunctions.java:34: error: illegal start of type
<<<<<<< ShowFunctions.java
                     ^
./calc/textui/search/ShowFunctions.java:34: error: ';' expected
<<<<<<< ShowFunctions.java
                          ^
./calc/textui/search/ShowFunctions.java:40: error: illegal start of type
=======
^
./calc/textui/search/ShowFunctions.java:40: error: ';' expected
=======
  ^
./calc/textui/search/ShowFunctions.java:40: error: illegal start of type
=======
    ^
./calc/textui/search/ShowFunctions.java:40: error: <identifier> expected
=======
      ^
./calc/textui/search/ShowFunctions.java:40: error: ';' expected
=======
       ^
./calc/textui/search/ShowFunctions.java:45: error: illegal start of type
>>>>>>> 1.2
^
./calc/textui/search/ShowFunctions.java:45: error: ';' expected
>>>>>>> 1.2
   ^
./calc/textui/search/ShowFunctions.java:45: error: illegal start of type
>>>>>>> 1.2
      ^
./calc/textui/search/ShowFunctions.java:45: error: <identifier> expected
>>>>>>> 1.2
       ^
./calc/textui/search/ShowFunctions.java:45: error: ';' expected
>>>>>>> 1.2
           ^
./calc/textui/search/ShowFunctions.java:47: error: reached end of file while parsing
}
 ^
./calc/textui/edit/Cut.java:29: error: illegal start of expression
<<<<<<< Cut.java
^
./calc/textui/edit/Cut.java:29: error: illegal start of expression
<<<<<<< Cut.java
  ^
./calc/textui/edit/Cut.java:29: error: illegal start of expression
<<<<<<< Cut.java
    ^
./calc/textui/edit/Cut.java:30: error: > expected
		String range = IO.readString(Message.addressRequest());
		^
./calc/textui/edit/Cut.java:30: error: ';' expected
		String range = IO.readString(Message.addressRequest());
		      ^
./calc/textui/edit/Cut.java:30: error: illegal start of expression
		String range = IO.readString(Message.addressRequest());
		             ^
./calc/textui/edit/Cut.java:30: error: ';' expected
		String range = IO.readString(Message.addressRequest());
		                 ^
./calc/textui/edit/Cut.java:38: error: illegal start of type
=======
^
./calc/textui/edit/Cut.java:38: error: ';' expected
=======
  ^
./calc/textui/edit/Cut.java:38: error: illegal start of type
=======
    ^
./calc/textui/edit/Cut.java:38: error: <identifier> expected
=======
      ^
./calc/textui/edit/Cut.java:38: error: ';' expected
=======
       ^
./calc/textui/edit/Cut.java:39: error: <identifier> expected
		String range = IO.readString(Message.addressRequest());
		            ^
./calc/textui/edit/Cut.java:40: error: <identifier> expected
		_receiver.cutContent(range);
		                    ^
./calc/textui/edit/Cut.java:40: error: <identifier> expected
		_receiver.cutContent(range);
		                          ^
./calc/textui/edit/Cut.java:42: error: class, interface, or enum expected
>>>>>>> 1.2
^
./calc/textui/edit/Delete.java:28: error: illegal start of type
<<<<<<< Delete.java
^
./calc/textui/edit/Delete.java:28: error: ';' expected
<<<<<<< Delete.java
  ^
./calc/textui/edit/Delete.java:28: error: illegal start of type
<<<<<<< Delete.java
    ^
./calc/textui/edit/Delete.java:28: error: <identifier> expected
<<<<<<< Delete.java
      ^
./calc/textui/edit/Delete.java:28: error: ';' expected
<<<<<<< Delete.java
       ^
./calc/textui/edit/Delete.java:28: error: illegal start of type
<<<<<<< Delete.java
              ^
./calc/textui/edit/Delete.java:28: error: ';' expected
<<<<<<< Delete.java
                   ^
./calc/textui/edit/Delete.java:38: error: illegal start of type
=======
^
./calc/textui/edit/Delete.java:38: error: ';' expected
=======
  ^
./calc/textui/edit/Delete.java:38: error: illegal start of type
=======
    ^
./calc/textui/edit/Delete.java:38: error: <identifier> expected
=======
      ^
./calc/textui/edit/Delete.java:38: error: ';' expected
=======
       ^
./calc/textui/edit/Delete.java:44: error: illegal start of type
>>>>>>> 1.2
^
./calc/textui/edit/Delete.java:44: error: ';' expected
>>>>>>> 1.2
   ^
./calc/textui/edit/Delete.java:44: error: illegal start of type
>>>>>>> 1.2
      ^
./calc/textui/edit/Delete.java:44: error: <identifier> expected
>>>>>>> 1.2
       ^
./calc/textui/edit/Delete.java:44: error: ';' expected
>>>>>>> 1.2
           ^
./calc/textui/edit/Delete.java:45: error: reached end of file while parsing
}
 ^
./calc/textui/edit/Copy.java:29: error: illegal start of expression
<<<<<<< Copy.java
^
./calc/textui/edit/Copy.java:29: error: illegal start of expression
<<<<<<< Copy.java
  ^
./calc/textui/edit/Copy.java:29: error: illegal start of expression
<<<<<<< Copy.java
    ^
./calc/textui/edit/Copy.java:30: error: > expected
		String range = IO.readString(Message.addressRequest());
		^
./calc/textui/edit/Copy.java:30: error: ';' expected
		String range = IO.readString(Message.addressRequest());
		      ^
./calc/textui/edit/Copy.java:30: error: illegal start of expression
		String range = IO.readString(Message.addressRequest());
		             ^
./calc/textui/edit/Copy.java:30: error: ';' expected
		String range = IO.readString(Message.addressRequest());
		                 ^
./calc/textui/edit/Copy.java:38: error: illegal start of type
=======
^
./calc/textui/edit/Copy.java:38: error: ';' expected
=======
  ^
./calc/textui/edit/Copy.java:38: error: illegal start of type
=======
    ^
./calc/textui/edit/Copy.java:38: error: <identifier> expected
=======
      ^
./calc/textui/edit/Copy.java:38: error: ';' expected
=======
       ^
./calc/textui/edit/Copy.java:39: error: <identifier> expected
		String range = IO.readString(Message.addressRequest());
		            ^
./calc/textui/edit/Copy.java:40: error: <identifier> expected
		_receiver.copyContent(range);
		                     ^
./calc/textui/edit/Copy.java:40: error: <identifier> expected
		_receiver.copyContent(range);
		                           ^
./calc/textui/edit/Copy.java:42: error: class, interface, or enum expected
>>>>>>> 1.2
^
./calc/textui/edit/Paste.java:28: error: illegal start of type
<<<<<<< Paste.java
^
./calc/textui/edit/Paste.java:28: error: ';' expected
<<<<<<< Paste.java
  ^
./calc/textui/edit/Paste.java:28: error: illegal start of type
<<<<<<< Paste.java
    ^
./calc/textui/edit/Paste.java:28: error: <identifier> expected
<<<<<<< Paste.java
      ^
./calc/textui/edit/Paste.java:28: error: ';' expected
<<<<<<< Paste.java
       ^
./calc/textui/edit/Paste.java:28: error: illegal start of type
<<<<<<< Paste.java
             ^
./calc/textui/edit/Paste.java:28: error: ';' expected
<<<<<<< Paste.java
                  ^
./calc/textui/edit/Paste.java:38: error: illegal start of type
=======
^
100 errors
make: *** [all] Error 1