Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Nitin Kumar Mishra committed Sep 25, 2016
1 parent 34c77f3 commit b3b4eca
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dist/prod/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- inject:css -->
<link rel="stylesheet" href="/start-angular/ani-angular-2/master/dist/prod/css/main.css?1474831596344">
<link rel="stylesheet" href="/start-angular/ani-angular-2/master/dist/prod/css/main.css?1474832198883">
<!-- endinject -->
</head>
<body>
Expand All @@ -35,8 +35,8 @@
<!-- endinject -->

<!-- inject:js -->
<script src="/start-angular/ani-angular-2/master/dist/prod/js/shims.js?1474831596339"></script>
<script src="/start-angular/ani-angular-2/master/dist/prod/js/app.js?1474831596340"></script>
<script src="/start-angular/ani-angular-2/master/dist/prod/js/shims.js?1474832198879"></script>
<script src="/start-angular/ani-angular-2/master/dist/prod/js/app.js?1474832198880"></script>
<!-- endinject -->


Expand Down

0 comments on commit b3b4eca

Please sign in to comment.