Merge lp:~jtv/gwacl/fix-silly-little-conflict into lp:gwacl

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: 80
Merged at revision: 80
Proposed branch: lp:~jtv/gwacl/fix-silly-little-conflict
Merge into: lp:gwacl
Diff against target: 9 lines (+1/-0)
1 file modified
example/live_example_managementapi.go (+1/-0)
To merge this branch: bzr merge lp:~jtv/gwacl/fix-silly-little-conflict
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+156333@code.launchpad.net

Commit message

Preempt silly little conflict that's stopping Raphaël's branch from landing.

Description of the change

For self-review.

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'example/live_example_managementapi.go'
2--- example/live_example_managementapi.go 2013-03-29 15:13:55 +0000
3+++ example/live_example_managementapi.go 2013-04-01 08:25:25 +0000
4@@ -147,4 +147,5 @@
5 fmt.Printf("Deleting storage account %s...\n", storageAccount)
6 api.DeleteStorageAccount(storageAccount)
7 fmt.Println("Done deleting storage account\n")
8+
9 }

Subscribers

People subscribed via source and target branches