Permalink
Browse files

merging conflicts

  • Loading branch information...
2 parents f579fce + 03f6da7 commit 54a090541caaed5a2d88f981586660f64e9cb7e5 @pengying committed Jul 31, 2011
Showing with 1 addition and 2 deletions.
  1. +1 −2 app/js/iap.js
View
@@ -32,5 +32,4 @@ function failureHandler(notification){
console.log(JSON.stringify(notification));
}
-})(iap);
-
+})(iap);

0 comments on commit 54a0905

Please sign in to comment.