fix: resolve conflict

issue: #128
Telenav · Jan 21, 2020 · 14c06c6 · 14c06c6
1 parent 2a5b2f8
commit 14c06c6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/integration/pkg/api/search/nearbychargestation/request.go b/integration/pkg/api/search/nearbychargestation/request.go
@@ -26,10 +26,7 @@ type Request struct {
 	Limit        int
 }
 
-<<<<<<< HEAD
-=======
 // NewRequest create an empty entity Request.
->>>>>>> master-telenav
 func NewRequest() *Request {
 	return &Request{
 		// Path