Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit 28fd385

Browse files
author
jacobawenger
committed
Updated dist files and added chrome-launched
1 parent dfd864c commit 28fd385

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

dist/angularfire.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
/*!
2-
<<<<<<< HEAD
3-
angularfire v0.8.0-pre2 2014-07-29
4-
* https://github.com/firebase/angularFire
5-
* Copyright (c) 2014 Firebase, Inc.
6-
* MIT LICENSE: http://firebase.mit-license.org/
7-
*/
8-
=======
9-
* angularfire 0.8.0 2014-07-28
2+
* angularfire 0.8.0 2014-07-29
103
* https://github.com/firebase/angularFire
114
* Copyright (c) 2014 Firebase, Inc.
125
* MIT LICENSE: http://firebase.mit-license.org/
136
*/
14-
>>>>>>> release_0.8
157

168
// AngularFire is an officially supported AngularJS binding for Firebase.
179
// The bindings let you associate a Firebase URL with a model (or set of

0 commit comments

Comments
 (0)