minor fix on Pull Id Generation

intelligentagents · May 21, 2018 · 6c119de · 6c119de
2 parents e03a645 + c5d6b0a
commit 6c119de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 /bin/
 /target/
+
+/src/utils/Tokens.java
diff --git a/src/utils/Tokens.java b/src/utils/Tokens.java
@@ -2,28 +2,13 @@
 
 public class Tokens {
 
-	//public static final String USERNAME = "guriosam";
-	//public static final String PASSWORD = "a91507629423c413809eb5b672760589b9f3027a";
-
-	//public static final String USERNAME = "andersonss";
-	//public static final String PASSWORD = "";
-
-	//public static final String USERNAME = "danieltmo";
-	//public static final String PASSWORD = "fc4b5e524a175873520927f8668f1f3e97abec46";
-
-	public static final String USERNAME = "filipefalcaos";
-	public static final String PASSWORD = "9a1540d269f52746f7df18d0d9bdec308bce3f19";
+<<<<<<< HEAD
 
-	//public static final String USERNAME = "francamacdowell";
-	//public static final String PASSWORD = "7fb8a77bdfc16f5cbab5e7c4a6252ff204cd6d6a";
-
-	//public static final String USERNAME = "r4phael";
-	//public static final String PASSWORD = "40c7371b84d7691263e534d6f31dfebbc6174c61";
-
-	//public static final String USERNAME = "egabrielnunes";
-	//public static final String PASSWORD = "7df3442dc884f28d52bc341f0d498205b558e127";
-
-
 
 
+=======
+	//public static final String USERNAME = "Github Username";
+	//public static final String PASSWORD = "OAuth Access Token";
+
+>>>>>>> c5d6b0afcb962b16a6415e8a4f848fe59a987b02
 }