wassname/DefinitelyTyped
1
0 Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-10-28 12:30:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'handleExtraObjectLiteralProperties2' into handleExtraObjectLiteralProperties

Browse Source 
Conflicts:
	jquery.uniform/jquery.uniform.d.ts
	log4js/log4js.d.ts
This commit is contained in:
Daniel Rosenwasser committed 2015-08-17 14:11:10 -07:00
2 parents 58345fc448 ceb059b2ab
commit dee433d5d1
10 files changed
+109 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

log4js/log4js.d.ts
Vendored
+4 -4
View File
@@ -233,11 +233,11 @@ declare module "log4js" {
| MultiprocessAppenderConfig
| LogglyAppenderConfig
| ClusteredAppenderConfig
interface UserDefinedAppenderConfig extends AppenderConfigBase {
[prop: string]: any;
interface CustomAppenderConfig extends AppenderConfigBase {
[prop: string]: any;
}
type AppenderConfig = CoreAppenderConfig | UserDefinedAppenderConfig;
type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
}