From bf2a5e9b3495912bc4e266052e15cceedab131cf Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 17 Jan 2019 14:13:25 +0200 Subject: Update license and sort imports --- config/config.go | 15 ++++++++------- config/config_test.go | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'config') diff --git a/config/config.go b/config/config.go index 8f45d76..0ddb4a3 100644 --- a/config/config.go +++ b/config/config.go @@ -1,31 +1,32 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package config import ( + "encoding/json" "io/ioutil" "os" "path/filepath" - - "encoding/json" "strings" "gopkg.in/yaml.v2" + "maunium.net/go/mautrix" + "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/matrix/pushrules" "maunium.net/go/gomuks/matrix/rooms" diff --git a/config/config_test.go b/config/config_test.go index ae7e725..f782618 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package config_test -- cgit v1.2.3