Projects >> ImageJA >>e8856a86bc2d335f2e7c50b5827873edcd43f0cd

Chunk
Conflicting content 
        return menus;
    }

<<<<<<< HEAD
}
=======
	// Returns 'true' if this macro program contains the specified word. */
	public boolean hasWord(String word) {
		int token, tokenAddress;
		for (int i=0; i>TOK_SHIFT;
			String str = table[tokenAddress].str;
			if (str!=null && str.equals(word)) return true;
		}
		return false;
	}
	
} // Program
>>>>>>> 3668018895f6c280bf35b65358cc54c858977579
Solution content 
        return menus;
    }

	// Returns 'true' if this macro program contains the specified word. */
	public boolean hasWord(String word) {
		int token, tokenAddress;
		for (int i=0; i>TOK_SHIFT;
			String str = table[tokenAddress].str;
			if (str!=null && str.equals(word)) return true;
		}
		return false;
	}
	
} // Program
File
Program.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration