added protection to Makfile against deploying cvs conflicts
authorivan <ivan>
Wed, 15 Jun 2011 01:37:52 +0000 (01:37 +0000)
committerivan <ivan>
Wed, 15 Jun 2011 01:37:52 +0000 (01:37 +0000)
commit30e0af53bde61f5272c942814140b78ce44815a5
treef7a4158686628bd0c5d16ecbe10a0dc172dd73fe
parenta877d4ec0aaef6f9eed872dc4dd1e8eb0271c128
added protection to Makfile against deploying cvs conflicts
Makefile