Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

merge conflicts resolved. #4

Merged
merged 1 commit into from

1 participant

Kashif Umair Liaqat
Kashif Umair Liaqat
Owner

No description provided.

Kashif Umair Liaqat kashif-umair merged commit d88c366 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 3, 2013
This page is out of date. Refresh to see the latest.
Showing with 0 additions and 7 deletions.
  1. +0 −7 gist-embed.js
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;
Something went wrong with that request. Please try again.