diff options
author | nat-goodspeed <nat@lindenlab.com> | 2024-09-05 15:40:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-05 15:40:12 -0400 |
commit | 04568da18d2261f3f7b851cf5341b766c9648204 (patch) | |
tree | 83d5db1c173636bb77ebb33e860fac77ab5d79e8 /.git-blame-ignore-revs | |
parent | 18d81e20f0b0044c16615953d7b69d7fb34d3449 (diff) | |
parent | ff2d79906ccef217194d5d9ec9d7025db03592a8 (diff) |
Merge pull request #2513 from secondlife/lua-merge-dev
Merge develop branch into Lua project branch.
Diffstat (limited to '.git-blame-ignore-revs')
-rw-r--r-- | .git-blame-ignore-revs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index cb070b0881..0851d20be0 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,5 +1,6 @@ # Replace tabs with spaces 1b68f71348ecf3983b76b40d7940da8377f049b7 +33418a77b716e122da9778869cdbabe97c83ff37 # Trim trailing whitespace a0b3021bdcf76859054fda8e30abb3ed47749e83 8444cd9562a6a7b755fcb075864e205122354192 |