Fix Conflicts:

index.html
This commit is contained in:
Gustavo Cortez 2014-06-03 11:09:31 -03:00
commit 9b349818b3
1 changed files with 1 additions and 1 deletions

View File

@ -753,7 +753,7 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
<script src="config.js"></script>
<!-- <script src="js/shell.js"></script> TODO -->
<!-- <script src="js/shell.js"></script> -->
<script src="lib/angular/angular.min.js"></script>
<script src="lib/moment/moment.js"></script>
<script src="lib/angular-moment/angular-moment.js"></script>