Commit 91d5b7ae authored by Omer Murat Yildirim's avatar Omer Murat Yildirim
Browse files

fix merge conflicts

parents ff9523ed 79e00a53
......@@ -15,6 +15,7 @@ You may also use Git to clone the repository from
Github and install it manually:
git clone https://github.com/tweepy/tweepy.git
cd tweepy
python setup.py install
**Note** only Python 2.6 and 2.7 are supported at
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment