Resolved conflicts in banks file

devcenter-square · Sep 22, 2015 · 99555b5 · 99555b5
1 parent 24eeca8
commit 99555b5
Showing 1 changed file with 1 addition and 21 deletions.
diff --git a/lib/ng-bank-parser/banks.rb b/lib/ng-bank-parser/banks.rb
@@ -8,11 +8,7 @@ class Banks
 					valid: "lib/ng-bank-parser/fixtures/gtb-excel-valid.xlsx",
 					invalid: "lib/ng-bank-parser/fixtures/gtb-excel-invalid.pdf",
 					extensions: ["xls","xlsx"]
-<<<<<<< HEAD
-				}]
-=======
 			}]
->>>>>>> dev
 		  },{
 				key: "hb",
 				name: "Heritage Bank",
@@ -30,7 +26,6 @@ class Banks
 					valid: "lib/ng-bank-parser/fixtures/uba-pdf-valid.pdf",
 					invalid: "lib/ng-bank-parser/fixtures/uba-pdf-invalid.pdf",
 					extensions: ["pdf"]
-<<<<<<< HEAD
 				}]
 		  },{
 				 key: "firstbank",
@@ -51,21 +46,6 @@ class Banks
 						 invalid: "lib/ng-bank-parser/fixtures/accessbank-pdf-invalid.pdf",
 						 extensions: ["pdf"]
 				 }]
-	  	}
-		]
-=======
-			}]
-		  },{
-				key: "firstbank",
-				name: "First Bank",
-				parsers: [{
-					format: "pdf",
-					valid: "lib/ng-bank-parser/fixtures/firstbank-pdf-valid.pdf",
-					fixture_password: 19856,
-					invalid: "lib/ng-bank-parser/fixtures/firstbank-pdf-invalid.pdf",
-					extensions: ["pdf"]
-			}]
-		}]
->>>>>>> dev
+	  	}]
 	end
 end