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`)
./calc/SpSheetManager.java:4: error: class, interface, or enum expected
<<<<<<< SpSheetManager.java
^
./calc/SpSheetManager.java:25: error: illegal start of type
=======
^
./calc/SpSheetManager.java:25: error: ';' expected
=======
  ^
./calc/SpSheetManager.java:25: error: illegal start of type
=======
    ^
./calc/SpSheetManager.java:25: error: <identifier> expected
=======
      ^
./calc/SpSheetManager.java:25: error: ';' expected
=======
       ^
./calc/SpSheetManager.java:28: error: illegal start of type
>>>>>>> 1.4
^
./calc/SpSheetManager.java:28: error: ';' expected
>>>>>>> 1.4
   ^
./calc/SpSheetManager.java:28: error: illegal start of type
>>>>>>> 1.4
      ^
./calc/SpSheetManager.java:28: error: <identifier> expected
>>>>>>> 1.4
       ^
./calc/SpSheetManager.java:28: error: ';' expected
>>>>>>> 1.4
           ^
./calc/SpSheetManager.java:41: error: '(' or '[' expected
		_cutBuffer = new Range;
		                      ^
./calc/SpSheetManager.java:42: error: '(' or '[' expected
		_spSheet = new SpreadSheet;
		                          ^
./calc/SpSheetManager.java:43: error: '(' or '[' expected
		_iterator = new Iterator;
		                        ^
./calc/SpSheetManager.java:91: error: illegal start of type
=======
^
./calc/SpSheetManager.java:91: error: ';' expected
=======
  ^
./calc/SpSheetManager.java:91: error: illegal start of type
=======
    ^
./calc/SpSheetManager.java:91: error: <identifier> expected
=======
      ^
./calc/SpSheetManager.java:91: error: ';' expected
=======
       ^
./calc/SpSheetManager.java:92: error: illegal start of type
	*/	
	 ^
./calc/SpSheetManager.java:92: error: <identifier> expected
	*/	
	  ^
./calc/SpSheetManager.java:93: error: ';' expected
>>>>>>> 1.4
   ^
./calc/SpSheetManager.java:93: error: illegal start of type
>>>>>>> 1.4
      ^
./calc/SpSheetManager.java:93: error: <identifier> expected
>>>>>>> 1.4
       ^
./calc/SpSheetManager.java:93: error: ';' expected
>>>>>>> 1.4
           ^
./calc/SpSheetManager.java:94: error: <identifier> expected
	@Override
	         ^
./calc/SpSheetManager.java:103: error: illegal start of type
<<<<<<< SpSheetManager.java
^
./calc/SpSheetManager.java:103: error: ';' expected
<<<<<<< SpSheetManager.java
  ^
./calc/SpSheetManager.java:103: error: illegal start of type
<<<<<<< SpSheetManager.java
    ^
./calc/SpSheetManager.java:103: error: <identifier> expected
<<<<<<< SpSheetManager.java
      ^
./calc/SpSheetManager.java:103: error: ';' expected
<<<<<<< SpSheetManager.java
       ^
./calc/SpSheetManager.java:103: error: illegal start of type
<<<<<<< SpSheetManager.java
                      ^
./calc/SpSheetManager.java:103: error: ';' expected
<<<<<<< SpSheetManager.java
                           ^
./calc/SpSheetManager.java:258: error: illegal start of expression
=======
^
./calc/SpSheetManager.java:258: error: illegal start of expression
=======
  ^
./calc/SpSheetManager.java:258: error: illegal start of expression
=======
    ^
./calc/SpSheetManager.java:258: error: illegal start of expression
=======
      ^
./calc/SpSheetManager.java:259: error: illegal start of expression
	public void seeRange(/*textUI??*/){
	^
./calc/SpSheetManager.java:259: error: illegal start of expression
	public void seeRange(/*textUI??*/){
	       ^
./calc/SpSheetManager.java:259: error: ';' expected
	public void seeRange(/*textUI??*/){
	                    ^
./calc/SpSheetManager.java:260: error: illegal start of expression
>>>>>>> 1.4
^
./calc/SpSheetManager.java:260: error: illegal start of expression
>>>>>>> 1.4
   ^
./calc/SpSheetManager.java:260: error: illegal start of expression
>>>>>>> 1.4
      ^
./calc/SpSheetManager.java:260: error: ';' expected
>>>>>>> 1.4
           ^
./calc/SpSheetManager.java:264: error: illegal start of expression
	public void insertContent(){
	^
./calc/SpSheetManager.java:264: error: illegal start of expression
	public void insertContent(){
	       ^
./calc/SpSheetManager.java:264: error: ';' expected
	public void insertContent(){
	                         ^
./calc/SpSheetManager.java:268: error: illegal start of expression
	public void copyRange(){
	^
./calc/SpSheetManager.java:268: error: illegal start of expression
	public void copyRange(){
	       ^
./calc/SpSheetManager.java:268: error: ';' expected
	public void copyRange(){
	                     ^
./calc/SpSheetManager.java:272: error: illegal start of expression
	public void deleteContent(){
	^
./calc/SpSheetManager.java:272: error: illegal start of expression
	public void deleteContent(){
	       ^
./calc/SpSheetManager.java:272: error: ';' expected
	public void deleteContent(){
	                         ^
./calc/SpSheetManager.java:276: error: illegal start of expression
	public void cutContent(){
	^
./calc/SpSheetManager.java:276: error: illegal start of expression
	public void cutContent(){
	       ^
./calc/SpSheetManager.java:276: error: ';' expected
	public void cutContent(){
	                      ^
./calc/SpSheetManager.java:280: error: illegal start of expression
	public void pasteContent(){
	^
./calc/SpSheetManager.java:280: error: illegal start of expression
	public void pasteContent(){
	       ^
./calc/SpSheetManager.java:280: error: ';' expected
	public void pasteContent(){
	                        ^
./calc/SpSheetManager.java:284: error: illegal start of expression
	public void seeCutBuffer(){
	^
./calc/SpSheetManager.java:284: error: illegal start of expression
	public void seeCutBuffer(){
	       ^
./calc/SpSheetManager.java:284: error: ';' expected
	public void seeCutBuffer(){
	                        ^
./calc/SpSheetManager.java:288: error: illegal start of expression
	public void seeSelPred(){
	^
./calc/SpSheetManager.java:288: error: illegal start of expression
	public void seeSelPred(){
	       ^
./calc/SpSheetManager.java:288: error: ';' expected
	public void seeSelPred(){
	                      ^
./calc/SpSheetManager.java:292: error: illegal start of expression
	public void contains(){
	^
./calc/SpSheetManager.java:292: error: illegal start of expression
	public void contains(){
	       ^
./calc/SpSheetManager.java:292: error: ';' expected
	public void contains(){
	                    ^
./calc/SpSheetManager.java:295: error: reached end of file while parsing
}
 ^
./calc/Function.java:32: error: ';' expected
		return o instanceof Function && equals (Function) o);
		                                                 ^
./calc/Function.java:32: error: not a statement
		return o instanceof Function && equals (Function) o);
		                                                  ^
./calc/Function.java:32: error: ';' expected
		return o instanceof Function && equals (Function) o);
		                                                   ^
./calc/EqualToFunction.java:26: error: <identifier> expected
	 public boolean ok(cellCntnt) {
	                            ^
./calc/EqualToValue.java:26: error: <identifier> expected
	 public boolean ok(cellCntnt) {
	                            ^
./calc/ArrayIterator.java:49: error: ';' expected
		Cell cell = _cells(_line)(_column);
		                         ^
./calc/ArrayIterator.java:49: error: not a statement
		Cell cell = _cells(_line)(_column);
		                          ^
./calc/ArrayIterator.java:49: error: ';' expected
		Cell cell = _cells(_line)(_column);
		                                 ^
./calc/ArrayIterator.java:53: error: ';' expected
			_column++
			         ^
./calc/ArrayIterator.java:56: error: ';' expected
			_line++
			       ^
./calc/ArrayIterator.java:63: error: ';' expected
		Cell cell = _cells(_line)(_column);
		                         ^
./calc/ArrayIterator.java:63: error: not a statement
		Cell cell = _cells(_line)(_column);
		                          ^
./calc/ArrayIterator.java:63: error: ';' expected
		Cell cell = _cells(_line)(_column);
		                                 ^
./calc/ArrayIterator.java:67: error: ';' expected
			_line++
			       ^
./calc/ArrayIterator.java:70: error: ';' expected
			_column++
			         ^
./calc/Subtraction.java:14: error: invalid method declaration; return type required
       public Addition (int value1, int value2) {
              ^
./calc/Content.java:51: error: ';' expected
		return o instanceof Content && equals (Content) o);
		                                               ^
./calc/Content.java:51: error: not a statement
		return o instanceof Content && equals (Content) o);
		                                                ^
./calc/Content.java:51: error: ';' expected
		return o instanceof Content && equals (Content) o);
		                                                 ^
./calc/SpreadSheet.java:14: error: ']' expected
	private int _line[_size];
	                  ^
./calc/SpreadSheet.java:14: error: illegal start of type
	private int _line[_size];
	                       ^
./calc/SpreadSheet.java:14: error: <identifier> expected
	private int _line[_size];
	                        ^
./calc/SpreadSheet.java:14: error: ';' expected
	private int _line[_size];
	                         ^
./calc/SpreadSheet.java:17: error: ']' expected
	private int _column[_size];
	                    ^
./calc/SpreadSheet.java:17: error: illegal start of type
	private int _column[_size];
	                         ^
./calc/SpreadSheet.java:17: error: <identifier> expected
	private int _column[_size];
	                          ^
./calc/SpreadSheet.java:17: error: ';' expected
	private int _column[_size];
	                           ^
./calc/SpreadSheet.java:31: error: <identifier> expected
	public Cell getCell(target){
	                          ^
./calc/SpreadSheet.java:37: error: illegal start of expression
	public int getSize () {
	^
./calc/SpreadSheet.java:37: error: ';' expected
	public int getSize () {
	                  ^
./calc/SpreadSheet.java:44: error: illegal start of expression
	public int getLine(int target){
	^
100 errors
make: *** [all] Error 1