From b8224539cd17209b5b1136918edb4e6f866ab89a Mon Sep 17 00:00:00 2001 From: Benjamin Chausse Date: Sat, 3 May 2025 15:40:13 -0400 Subject: Avoid xpr conflicts during collab --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitignore') 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 -- cgit v1.2.3