summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkarl <karl>2004-07-06 15:47:43 +0000
committerkarl <karl>2004-07-06 15:47:43 +0000
commitddbaee0a05eae09beed9cc8f37db33cfb8fc03d5 (patch)
treec8120e17157d6fd19e24363721fa9df19a926d9b
parentb0fcfdbbeefd7e835c719faa12b3240121cfaf93 (diff)
downloadtog-pegasus-TESTTAG2.zip
tog-pegasus-TESTTAG2.tar.gz
tog-pegasus-TESTTAG2.tar.xz
PEP#: 999TESTTAG2
TITLE: TEST COMMIT for merge test. DESCRIPTION: Please ignore this commit. It is to the dummy directory to test merging and does not change anything in the PEgasus work.
-rw-r--r--Dummy/Document1.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Dummy/Document1.txt b/Dummy/Document1.txt
index d500e17..98605d2 100644
--- a/Dummy/Document1.txt
+++ b/Dummy/Document1.txt
@@ -24,3 +24,5 @@ Fixed one more bug
checking CVS upgrade
+Add a line to represent our branch changes.
+