/Kronos/Kronos/testGitConflict.aspx.cs
https://github.com/lle/soen341kronos · C# · 39 lines · 29 code · 6 blank · 4 comment · 0 complexity · 56ea3577601ad323b8a8e8f9888c172a MD5 · raw file
- 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
- }
-
-
-
- }
- }