Permalink
Browse files

Merge pull request #4 from kashif-umair/hotfix/fixed_file_name_split_bug

merge conflicts resolved.
  • Loading branch information...
kashif-umair committed Feb 3, 2013
2 parents d09ebd6 + c4a8194 commit d88c36600eafc97df3a6c60ff2d3456ecd1414fb
Showing with 0 additions and 7 deletions.
  1. +0 −7 gist-embed.js
View
@@ -12,16 +12,9 @@ $(function(){
line,
data = {};
-<<<<<<< Updated upstream
- id = $elem.attr('id') || '';
- file = $elem.attr('data-file');
- line = $elem.attr('data-line');
- splittedFileName = file.split('.').join('-');
-=======
id = $elem.attr('id') || '';
file = $elem.attr('data-file');
line = $elem.attr('data-line');
->>>>>>> Stashed changes
if(file){
data.file = file;

0 comments on commit d88c366

Please sign in to comment.