summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorBenjamin Chausse <benjamin@chausse.xyz>2025-05-03 15:40:13 -0400
committerBenjamin Chausse <benjamin@chausse.xyz>2025-05-03 15:40:13 -0400
commitb8224539cd17209b5b1136918edb4e6f866ab89a (patch)
treef6226a7bf163f7191898e884d3ba6ed9d3c86245 /.gitignore
parenta996243837333b7c04177d52d401cf80a0f428e9 (diff)
Avoid xpr conflicts during collab
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9e1e38d..b287b9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@
#XPR + *.XML ? XPR (Files are merged into a single XPR file for 2014.1 version)
#Do NOT ignore *.xpr files
!*.xpr
+pb_APP_log_comb.xpr
#Include *.xml files for 2013.4 or earlier version
!*.xml
#########
@@ -271,3 +272,5 @@
#########
*.cache/
*.runs/
+# TEMPORARY: Avoid collab conflicts
+pb_APP_log_comb.xpr