/Kronos/Kronos/testGitConflict.aspx.cs

using System;

using System.Collections.Generic;

using System.Linq;

using System.Web;

using System.Web.UI;

using System.Web.UI.WebControls;

using System.Data.SqlClient;

using System.Data;

using System.Data.Linq;

using System.Configuration;

using Kronos.CLASSES;

using System.Net.Mail;

using System.Net;



namespace Kronos

{

    public partial class test : System.Web.UI.Page

    {

        protected void Page_Load(object sender, EventArgs e)

        {

            register_label.Visible = false;

        }



        protected void testGitLam()

        {

            //Test! Lam

        }



        protected void testGitAlex()

        {

            //Test! Alex

			//THIS WWILL NOT WORK!!

			//CHANGING SOME STUFF

        }



       



        }

}