From e0ae2d3cacec4edca90d586e57aa1e9893a57107 Mon Sep 17 00:00:00 2001 From: Eilert Tunheim <emtunhei@stud.ntnu.no> Date: Thu, 17 Feb 2022 16:09:52 +0100 Subject: [PATCH] added .gitignore file --- .idea/.gitignore | 8 ----- .../shelved.patch | 32 +++++++++++++++++++ .idea/vcs.xml | 6 ++++ 3 files changed, 38 insertions(+), 8 deletions(-) delete mode 100644 .idea/.gitignore create mode 100644 .idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch new file mode 100644 index 0000000..2e30f5a --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch @@ -0,0 +1,32 @@ +Index: .idea/.gitignore +=================================================================== +diff --git a/.idea/.gitignore b/.idea/.gitignore +deleted file mode 100644 +--- a/.idea/.gitignore (revision bf612e45b76fce5444faaa257112a1e684497c29) ++++ /dev/null (revision bf612e45b76fce5444faaa257112a1e684497c29) +@@ -1,8 +0,0 @@ +-# Default ignored files +-/shelf/ +-/workspace.xml +-# Editor-based HTTP Client requests +-/httpRequests/ +-# Datasource local storage ignored files +-/dataSources/ +-/dataSources.local.xml +Index: .idea/vcs.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/vcs.xml b/.idea/vcs.xml +new file mode 100644 +--- /dev/null (date 1645110263019) ++++ b/.idea/vcs.xml (date 1645110263019) +@@ -0,0 +1,6 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<project version="4"> ++ <component name="VcsDirectoryMappings"> ++ <mapping directory="" vcs="Git" /> ++ </component> ++</project> +\ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="Git" /> + </component> +</project> \ No newline at end of file -- GitLab