Merge branch 'main' into feature/egne-env-vars-for-kommandoer

kartverket · Aug 28, 2024 · 453468e · 453468e
2 parents 55bbabb + 1a30e9e
commit 453468e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ gradle-app.setting
 
 # Idea
 .idea/*
+
+workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,5 @@ gradle-app.setting

		# Idea
		.idea/*

		workspace.xml