From 61c89b1b1a73030000b23466e002b86e974f17bd Mon Sep 17 00:00:00 2001
From: eduard93 <lebeduk93@gmail.com>
Date: Fri, 20 Feb 2015 14:03:16 +0300
Subject: [PATCH] Class syntax

---
 GitHubUpdater/Task.cls.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/GitHubUpdater/Task.cls.xml b/GitHubUpdater/Task.cls.xml
index e01079d..dd30ea8 100644
--- a/GitHubUpdater/Task.cls.xml
+++ b/GitHubUpdater/Task.cls.xml
@@ -51,12 +51,8 @@ Repository branch, usually master. Leave empty, if you want to receive default b
 	
 	Set Owner = $p(..GitHubURL,"/",4)
 	Set Repository = $p(..GitHubURL,"/",5)
-		
-<<<<<<< HEAD
+	
 	Return ..Update(Owner, Repository, ..Branch, ..Username, ..Password, ..Namespace)
-=======
-	Return ##class(CacheGitHubCI.Hook).Update(Owner, Repository, ..Branch, ..Username, ..Password, ..Namespace)
->>>>>>> 203303a0b4d22196f711e5a3e544c44adb21c685
 ]]></Implementation>
 </Method>