Fixed the merge conflicts caused by refactoring / deleted file.

ddaws · ddaws · commit 5fce91334c1e · 2014-12-04T23:40:31.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 # these will be generated in compilation
 bin
 .DS_Store
+obj
diff --git a/src/Request.cs b/src/Request.cs
@@ -270,7 +270,7 @@ public virtual void Send( Action< HTTP.Request > callback = null)
             }
 
             if ( GetHeader( "User-Agent" ) == "" ) {
-                SetHeader( "User-Agent", "UnityWeb 1.0 ( Unity " + Application.unityVersion + " ) ( " + SystemInfo.operatingSystem + " )" );
+                SetHeader( "User-Agent", "UnityWeb/1.0 (Unity " + Application.unityVersion + "; " + SystemInfo.operatingSystem + ")" );
             }
 
             if ( GetHeader( "Connection" ) == "" ) {

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public virtual void Send( Action< HTTP.Request > callback = null)`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`if ( GetHeader( "User-Agent" ) == "" ) {`
`273`		`- SetHeader( "User-Agent", "UnityWeb 1.0 ( Unity " + Application.unityVersion + " ) ( " + SystemInfo.operatingSystem + " )" );`
	`273`	`+ SetHeader( "User-Agent", "UnityWeb/1.0 (Unity " + Application.unityVersion + "; " + SystemInfo.operatingSystem + ")" );`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`if ( GetHeader( "Connection" ) == "" ) {`