working ide

drcoolsanjeev · drcoolsanjeev · commit 3a8d46cf8325 · 2018-02-09T00:54:34.000+05:30
diff --git a/codecamp-front/src/app/components/register/register.component.html b/codecamp-front/src/app/components/register/register.component.html
@@ -103,13 +103,8 @@
 
     </div>
 
-<<<<<<< HEAD
-    <input
-    [disabled]="!form.valid|| processing  "
-=======
     <input
     [disabled]="!form.valid "
->>>>>>> 8531975aecbea1ac4c487ad9795acb0314b2d71d
     type="submit" class="btn btn-primary" value="Sign up">
   </form>
 </div>
