Artifact 8fbe8434acd4da6f0d3f9b21a3b6892986508132:
- File megatest-version.scm — part of check-in [f9f4c1c4ea] at 2015-05-27 20:58:29 on branch borked-merge — Oops. Borked merge to side. (user: matt, size: 501) [annotate] [blame] [check-ins using] [more...]
;; Always use two or four digit decimal ;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00.. (declare (unit megatest-version)) <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< (define megatest-version 1.6014) ======= COMMON ANCESTOR content follows ============================ (define megatest-version 1.6009) ======= MERGED IN content follows ================================== (define megatest-version 1.6013) >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>