[incubator-trafficcontrol] 19/23: fixed merge issue

[dangogh]

This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit fd8f390f8682b1fe52fa109ea9f15db3dc9de224
Author: Dewayne Richardson <dewr...@apache.org>
AuthorDate: Thu Feb 22 08:12:48 2018 -0700

    fixed merge issue
---
 traffic_ops/traffic_ops_golang/division/divisions.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/traffic_ops/traffic_ops_golang/division/divisions.go 
b/traffic_ops/traffic_ops_golang/division/divisions.go
index 176c256..a461a3c 100644
--- a/traffic_ops/traffic_ops_golang/division/divisions.go
+++ b/traffic_ops/traffic_ops_golang/division/divisions.go
@@ -50,6 +50,7 @@ func (division *TODivision) GetAuditName() string {
 func (division *TODivision) GetID() (int, bool) {
        return division.ID, true
 }
+
 func (division *TODivision) SetID(i int) {
        division.ID = i
 }

-- 
To stop receiving notification emails like this one, please contact
dang...@apache.org.