diff options
| author | Paul Buetow <pbuetow@mimecast.com> | 2021-05-27 17:46:21 +0100 |
|---|---|---|
| committer | Paul Buetow <pbuetow@mimecast.com> | 2021-05-27 17:46:21 +0100 |
| commit | aa8c9c01afc7a288ce3b7e75948df15c8e69e6bc (patch) | |
| tree | c18fdc22699d083bcb9fd45b57703ac9e63a7d0b /internal | |
| parent | 63eb081c5beb0c02fa01415c50d0c1c0a7132d6f (diff) | |
| parent | 8ad996f907410d91b3cfd775b886e993e8dddc14 (diff) | |
fix merge conflictv3.3.1
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/datas/rbuffer_test.go | 2 | ||||
| -rw-r--r-- | internal/version/version.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/datas/rbuffer_test.go b/internal/datas/rbuffer_test.go index 456511a..843bb8e 100644 --- a/internal/datas/rbuffer_test.go +++ b/internal/datas/rbuffer_test.go @@ -29,7 +29,7 @@ func TestRBuffer(t *testing.T) { fiveValues := []string{ "42 is the answer!", - "Scroption: Get over here!", + "Scorpion: Get over here!", "Have you swiped your nectar card?", "Please mind the gap between the train and the platform!", "Visit DTail at https://dtail.dev", diff --git a/internal/version/version.go b/internal/version/version.go index 23149a5..3c31059 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -11,7 +11,7 @@ const ( // Name of DTail. Name string = "DTail" // Version of DTail. - Version string = "3.3.0" + Version string = "3.3.1" // Additional information for DTail Additional string = "" // ProtocolCompat -ibility version. |