Created
September 11, 2014 19:47
-
-
Save ignaciojcano/b1017fb4db898bf40ef7 to your computer and use it in GitHub Desktop.
conflict fail
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
| <<<<<<< HEAD | |
| ======= | |
| if(typeof self.isFavorite !== 'undefined'){ | |
| response.children[folder].isFavorite=self.isFavorite; | |
| } | |
| >>>>>>> favorite_list |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment