remove: removed VSCODE merge conflict msg

chris-greening · Jan 17, 2021 · 354becd · 354becd
1 parent 0c1ece0
commit 354becd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/instascrape/scrapers/profile.py b/instascrape/scrapers/profile.py
@@ -136,10 +136,6 @@ def get_posts(self, webdriver, amount=None, login_first=False, login_pause=60, m
         # Remove excess posts from right of list
         posts = posts[:amount]
 
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
         # If scrape arg is True, scrape all posts using webdriver
         scraped_posts = []
         if scrape: