Updated SmoothTrend #37
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nto sustainability-lab-master vayu/smoothTrend.py
vayu/interactiveChoroplethPlot.py
Outdated
Comment on lines
336
to
344
| <<<<<<< HEAD | ||
| return map_ | ||
| ======= | ||
| return map_ | ||
| >>>>>>> 160196764e2db9f7167fd1b1acdbfce29ed6218f | ||
| ======= | ||
| return map_ | ||
| >>>>>>> 160196764e2db9f7167fd1b1acdbfce29ed6218f |
There was a problem hiding this comment.
I think we might have an issue here.
There was a problem hiding this comment.
It should just be
return map_
apoorvagnihotri
requested changes
May 22, 2020
added 2 commits
May 22, 2020 18:45
|
Hey Apoorv,
I have made the changes. Please check.
Thanks
…On Fri, May 22, 2020 at 5:18 PM Apoorv Agnihotri ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In vayu/interactiveChoroplethPlot.py
<#37 (comment)>
:
> +<<<<<<< HEAD
+<<<<<<< HEAD
+ return map_
+=======
+ return map_
+>>>>>>> 1601967
+=======
+ return map_
+>>>>>>> 1601967
It should just be
return map_
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#37 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AGEL4QPTHAVMCF7MFFUZ2VDRSZRCNANCNFSM4NHVCXCQ>
.
--
Thank You
Tanmay Srivastav
Bharti Vidyapeeth's College of Engineering
Website: bit.ly/tanmaySrivastava
LinkedIn: https://www.linkedin.com/in/tanmay-srivastava-335775170/
|
apoorvagnihotri
approved these changes
May 23, 2020
apoorvagnihotri
approved these changes
May 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#27