Merge pull request #2226 from jarsi/remove_mergeconflict_files

Remove some mergeconflict artifacts
nest · Dec 2, 2021 · 31eb6de · 31eb6de
2 parents 340e004 + 1b4a570
commit 31eb6de
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2,047 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,3 +76,6 @@ cscope.out
 .cproject
 .pydevproject
 .python-version
+
+# Merge conflict artifacts
+*.orig
diff --git a/libnestutil/CMakeLists.txt.orig b/libnestutil/CMakeLists.txt.orig