RetailCRM-Mirror/messenger
1
0
Fork 0
mirror of synced 2025-04-09 20:10:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from Neur0toxine/master

Browse source 
Fixed imports, picked https://github.com/paked/messenger/commit/efd9d44
This commit is contained in:
Alex Lushpai 2019-06-11 12:19:26 +03:00 • committed by Neur0toxine
parent 07a6d51508
commit c633e41749
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
receiving.go
View file

@ -115,11 +115,20 @@ type Payload struct {
URL string `json:"url,omitempty"`
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
Title string `json:"title,omitempty"`
=======
>>>>>>> fcf031d (Fix conflict with receiving.go while cherry-picking)
<<<<<<< HEAD
>>>>>>> 92cbea4 (Fix conflict with receiving.go while cherry-picking)
=======
=======
Title string `json:"title,omitempty"`
>>>>>>> 46e5525 (Add title to payload)
=======
>>>>>>> 0a2552c (Merge pull request #1 from Neur0toxine/master)
>>>>>>> 432a6ee (Merge pull request #1 from Neur0toxine/master)
// Coordinates is Lat/Long pair of location pin
Coordinates *Coordinates `json:"coordinates,omitempty"`
}