diff --git a/File1 b/File1 index d8bddea..b0b7fa0 100644 --- a/File1 +++ b/File1 @@ -1 +1,2 @@ This is the first entry added by Ed. +File changed from another branch