blob: 335e9059b5ca5c0d0af412789eddc685a3a8cab1 [file] [log] [blame]
From 7acc0c08b31c46a358e496cf69fb2750bfdbe823 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Fri, 29 Nov 2019 23:25:13 +0200
Subject: [PATCH] Make a conflicting change to the README file.
Change-Id: I74a6d83a52acb5c72d088c0c3d1d74f10c5f592f
---
README.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.txt b/README.txt
index e16c97f..0ed1e0e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,2 +1,2 @@
This is a sample Git repository for testing the operation of
-the git-if-needed tool.
+the git-if-needed tool. There is nothing more to it.
--
2.24.0