KickJava   Java API By Example, From Geeks To Geeks.

Java > Open Source Codes > Versionstest


1 /**
2  * @author Oliver Schmidt
3  *
4  * Just to explore merge behaviour of cvs
5  * @version $Id: Versionstest.java,v 1.7 2003/02/27 18:51:40 oliver_schmidt Exp $
6  */

7 public class Versionstest {
8  public static void main(String JavaDoc[] args) {
9     // 1
10
// 2 main branch
11
// 3 two changed lines
12
// 4
13
// 5
14
// 6
15
// 7
16
// 8
17
// 9
18
// 10
19
// 11
20
// 12
21
// 13 fix in line 13
22
// 14
23
// 15
24
// 16
25
// 17
26
// 18
27
// 19
28
// 20
29
}
30 }
31
Popular Tags