Bojan Smojver wrote: > > This is what I get when I attempt to checkout: > > ------------------------------------------ > RCS file: > >/home/cvspublic/jakarta-velocity/src/java/org/apache/velocity/util/introspection/Introspector.java,v > retrieving revision 1.11 > retrieving revision 1.16 > Merging differences between 1.11 and 1.16 into Introspector.java > rcsmerge: warning: conflicts during merge > cvs server: conflicts found in > jakarta-velocity/src/java/org/apache/velocity/util/introspection/Introspector.java > ------------------------------------------ > > Bojan > > PS. Not surprisingly, the thing doesn't compile :-(
Blowing away the 1.11 Introspector.java seems to cure it... Bojan
