Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba

Conflicts:
	src/YalpClients/EflClient/list_test.edc
	src/YalpClients/EflClient/list_test_elem.py

Signed-off-by: Nicole Vreden <damba@slartibartfast.traut>

1 files changed, 22 insertions, 22 deletions

diff --git a/src/YalpClients/WebClient/Default.aspx.cs b/src/YalpClients/WebClient/Default.aspx.cs
index 0bd1d7d..dbb34a1 100644
--- a/src/YalpClients/WebClient/Default.aspx.cs
+++ b/src/YalpClients/WebClient/Default.aspx.cs
@@ -1,22 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace TwitterSearchApplication.Web
-{
-    public partial class _Default : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-
-        protected void Button1_Click(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Web;

+using System.Web.UI;

+using System.Web.UI.WebControls;

+

+namespace TwitterSearchApplication.Web

+{

+    public partial class _Default : System.Web.UI.Page

+    {

+        protected void Page_Load(object sender, EventArgs e)

+        {

+

+        }

+

+        protected void Button1_Click(object sender, EventArgs e)

+        {

+

+        }

+    }

+}