fix go lint issue

canonical · Jul 24, 2015 · 78ee2fe · 78ee2fe
1 parent aedc13b
commit 78ee2fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/i18n/xgettext-go/main.go b/i18n/xgettext-go/main.go
@@ -182,7 +182,7 @@ msgstr  "Project-Id-Version: %s\n"
         "Content-Type: text/plain; charset=CHARSET\n"
         "Content-Transfer-Encoding: 8bit\n"
 
-`, opts.PackageName, opts.MsgIdBugsAddress, formatTime())
+`, opts.PackageName, opts.MsgIDBugsAddress, formatTime())
 	fmt.Fprintf(out, "%s", header)
 
 	// yes, this is the way to do it in go
@@ -238,7 +238,7 @@ var opts struct {
 
 	NoLocation bool `long:"no-location" description:"do not write '#: filename:line' lines"`
 
-	MsgIdBugsAddress string `long:"msgid-bugs-address" default:"EMAIL" description:"set report address for msgid bugs"`
+	MsgIDBugsAddress string `long:"msgid-bugs-address" default:"EMAIL" description:"set report address for msgid bugs"`
 
 	PackageName string `long:"package-name" description:"set package name in output"`
 

diff --git a/i18n/xgettext-go/main_test.go b/i18n/xgettext-go/main_test.go
@@ -55,7 +55,7 @@ func (s *xgettextTestSuite) SetUpTest(c *C) {
 	opts.KeywordPlural = "i18n.NG"
 	opts.SortOutput = true
 	opts.PackageName = "snappy"
-	opts.MsgIdBugsAddress = "snappy-devel@lists.ubuntu.com"
+	opts.MsgIDBugsAddress = "snappy-devel@lists.ubuntu.com"
 
 	// mock time
 	formatTime = func() string {

diff --git a/po/snappy.pot b/po/snappy.pot
@@ -256,7 +256,6 @@ msgstr  ""
 
 msgid   "This command adds access to a specific hardware device (e.g. /dev/"
         "ttyUSB0) for an installed package."
->>>>>>> MERGE-SOURCE
 msgstr  ""
 
 msgid   "This command is no longer available, please use the \"list\" command"