Merging in latest changes from master and resolved conflicts.

author: Anton Hvornum <anton.feeds@gmail.com> 2021-05-21 09:56:42 +0200
committer: Anton Hvornum <anton.feeds@gmail.com> 2021-05-21 09:56:42 +0200
commit: f9ec8f2a2791b68f26bc858ccd6dea88720ae7c2 (patch)
tree: ccb8ff9acc6bb3cadaa59b1f4db9a377a51da08a /.gitignore
parent: 129ceaea8be14362e2b22cbbf8b83ae0e392d1e8 (diff)
parent: 54a693be4fa2fbce83fd894b5ac3b0909f3a1e10 (diff)
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 00f42d12..b357b543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,10 @@ SAFETY_LOCK
 **/**.network
 **/**.target
 **/**.qcow2
-**/test.py
+/test*.py
 **/archiso
 /guided.py
 /install.log
+venv
+.idea/**
+**/install.log
+\ No newline at end of file
author	Anton Hvornum <anton.feeds@gmail.com>	2021-05-21 09:56:42 +0200
committer	Anton Hvornum <anton.feeds@gmail.com>	2021-05-21 09:56:42 +0200
commit	f9ec8f2a2791b68f26bc858ccd6dea88720ae7c2 (patch)
tree	ccb8ff9acc6bb3cadaa59b1f4db9a377a51da08a /.gitignore
parent	129ceaea8be14362e2b22cbbf8b83ae0e392d1e8 (diff)
parent	54a693be4fa2fbce83fd894b5ac3b0909f3a1e10 (diff)