10000 Remove git marks · sangsiri/twilio-python@4763b91 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4763b91

Browse files
committed
Remove git marks
1 parent 2eccd6a commit 4763b91

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

CHANGES.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,15 @@ Released November 3, 2015:
7878
Version 4.8.0
7979
-------------
8080

81-
<<<<<<< HEAD
8281
Released November 2, 2015:
8382

8483
- Add SMS pricing endpoint
8584

86-
Version 4.6.0-edge
85+
Version 4.6.0
8786
-------------
8887

8988
Released October 28, 2015:
9089

91-
=======
92-
- Add support for SMS pricing
93-
94-
95-
Version 4.6.0
96-
-------------
97-
98-
>>>>>>> bae308162e9e9505a73651d1de0a946e59c30267
9990
- Add /Keys endpoint
10091

10192
Version 4.6.0

0 commit comments

Comments
 (0)
0