Resolved conflict in ASIHTTPRequestConfig.h

.gitignore

@@ -1,4 +1,11 @@
 build
+*xcodeproj/*mode*
+*xcodeproj/*pbxuser
+*xcodeproj/*per*
+*xcodeproj/project.xcworkspace
+*xcodeproj/xcuserdata
+*tmproj
+.DS_Store
+profile
 *.pbxuser
 *.mode1v3
-.DS_Store

Classes/ASIAuthenticationDialog.h

@@ -7,22 +7,29 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 @class ASIHTTPRequest;
 
 typedef enum _ASIAuthenticationType {
 	ASIStandardAuthenticationType = 0,
     ASIProxyAuthenticationType = 1
 } ASIAuthenticationType;
-
-@interface ASIAuthenticationDialog : NSObject <UIActionSheetDelegate, UITableViewDelegate, UITableViewDataSource> {
+
+@interface ASIAutorotatingViewController : UIViewController
+@end
+
+@interface ASIAuthenticationDialog : ASIAutorotatingViewController <UIActionSheetDelegate, UITableViewDelegate, UITableViewDataSource> {
 	ASIHTTPRequest *request;
-	UIActionSheet *loginDialog;
 	ASIAuthenticationType type;
+	UITableView *tableView;
+	UIViewController *presentingController;
+	BOOL didEnableRotationNotifications;
 }
 + (void)presentAuthenticationDialogForRequest:(ASIHTTPRequest *)request;
-+ (void)presentProxyAuthenticationDialogForRequest:(ASIHTTPRequest *)request;
++ (void)dismiss;
 
 @property (retain) ASIHTTPRequest *request;
-@property (retain) UIActionSheet *loginDialog;
 @property (assign) ASIAuthenticationType type;
+@property (assign) BOOL didEnableRotationNotifications;
+@property (retain, nonatomic) UIViewController *presentingController;
 @end