diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |