Permalink
Browse files

Seed BUild

  • Loading branch information...
1 parent 0ddbfdd commit c60389e3453fe42281d14eba5c7185fc175a2d89 @davglass davglass committed Jan 7, 2013
@@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
@@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
View
@@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
View
@@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
@@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
View
@@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
View
@@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/
/**
-<<<<<<< HEAD
-Event to wait for before executing the `use()` callback.
-
-The following events are supported:
-
- - available
- - contentready
- - domready
- - load
-
-The event may be specified as a string or as an object hash that provides
-additional event configuration, as illustrated in the example below.
-
-=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
@@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
->>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:

0 comments on commit c60389e

Please sign in to comment.