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, 16 insertions, 16 deletions

diff --git a/src/YalpClients/WebClient/Properties/AppManifest.xml b/src/YalpClients/WebClient/Properties/AppManifest.xml
index 2e175fc..31a38be 100644
--- a/src/YalpClients/WebClient/Properties/AppManifest.xml
+++ b/src/YalpClients/WebClient/Properties/AppManifest.xml
@@ -1,16 +1,16 @@
-<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
-    <Deployment.Parts>
-    </Deployment.Parts>
-
-    <!-- Uncomment the markup and update the fields below to make your application offline enabled
-    <Deployment.ApplicationIdentity>
-        <ApplicationIdentity 
-            ShortName="Out of Browser Silverlight Application" 
-            Title="Window Title of Your Silverlight Application">
-            <ApplicationIdentity.Blurb>Description of your Silverlight application</ApplicationIdentity.Blurb>
-        </ApplicationIdentity>
-    </Deployment.ApplicationIdentity>
-    -->
-</Deployment>
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"

+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+>

+    <Deployment.Parts>

+    </Deployment.Parts>

+

+    <!-- Uncomment the markup and update the fields below to make your application offline enabled

+    <Deployment.ApplicationIdentity>

+        <ApplicationIdentity 

+            ShortName="Out of Browser Silverlight Application" 

+            Title="Window Title of Your Silverlight Application">

+            <ApplicationIdentity.Blurb>Description of your Silverlight application</ApplicationIdentity.Blurb>

+        </ApplicationIdentity>

+    </Deployment.ApplicationIdentity>

+    -->

+</Deployment>