diff options
| author | LYAM <cous5830@gmail.com> | 2025-05-03 15:41:31 -0400 |
|---|---|---|
| committer | LYAM <cous5830@gmail.com> | 2025-05-03 15:41:31 -0400 |
| commit | 97264b8e89f704f55cc41673db9bceeff325ec6d (patch) | |
| tree | f6226a7bf163f7191898e884d3ba6ed9d3c86245 | |
| parent | 0c51d97f72e73da1358f011383166ecac335b8fe (diff) | |
| parent | b8224539cd17209b5b1136918edb4e6f866ab89a (diff) | |
Merge branch 'master' of git.chausse.xyz:s4-app1
| -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 |