From cfc0341c66e5c24ee4c1b8a8e53afac99587244b Mon Sep 17 00:00:00 2001 From: AndreaChirulescu Date: Sun, 9 May 2021 21:29:28 +0200 Subject: After installing psalm, I got these files modified with, what seems to be, local hashkeys? --- psalm.xml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 psalm.xml (limited to 'psalm.xml') diff --git a/psalm.xml b/psalm.xml new file mode 100644 index 0000000..8abd320 --- /dev/null +++ b/psalm.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 5dbd4fdfbda8c7ed165728f5835f9520828b7b2e Mon Sep 17 00:00:00 2001 From: AndreaChirulescu Date: Sun, 9 May 2021 22:08:31 +0200 Subject: Recommitted, with removed head<<<<<< and >>>> --- psalm.xml | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'psalm.xml') diff --git a/psalm.xml b/psalm.xml index 5cf23eb..6b0f00f 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,13 +1,11 @@ -<<<<<<< HEAD -======= + ->>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - -======= @@ -57,4 +27,3 @@ SPDX-License-Identifier: CC0-1.0 ->>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d -- cgit v1.2.3