diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-06-18 15:49:06 -0700 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2019-06-18 15:49:06 -0700 |
| commit | 91cf45e5e5e71c644f0216b93ff5af7f6fc513e5 (patch) | |
| tree | bc88250ccf613f6bed416fefe26f5ad3f72119f2 /src/CHANGES.txt | |
| parent | 958fcfe1a37f2abea6104af3a2995cd714d13754 (diff) | |
| download | scons-git-91cf45e5e5e71c644f0216b93ff5af7f6fc513e5.tar.gz | |
[skip ci] remove conflict markers from CHANGES.txt
Diffstat (limited to 'src/CHANGES.txt')
| -rwxr-xr-x | src/CHANGES.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index cd73140de..6a8d626bb 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -72,10 +72,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER ParseFlags: -iquote and -idirafter. - Fix more re patterns that contain \ but not specified as raw strings (affects scanners for D, LaTeX, swig) -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes From Mathew Robinson: - Update cache debug output to include cache hit rate. |