remove cvs conflict indicators
new version
*** empty log message ***
new version 1.0.0
version 0_0_2
new spec file for PhEDEx Data Service
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.