From ac4c80a69e3036cdfd3e45bc31be09ecd31127be Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz <jakob@collabora.com> Date: Thu, 13 Jun 2019 17:32:53 +0100 Subject: [PATCH] xrt: Tidy .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9c9112d54..e5107b686 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,6 @@ build*/ # Ignore local settings .vscode *.autosave + # Ignore merge-conflict resolution files *.orig -- GitLab