removed navdata as it will be regenerated and ignored it as it always caused merge...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/.gitignore b/.gitignore
index d1971127b1d530dde46a52c28bd155f1f972c312..cf4a7c5b0dae6e64df0a9d42472e823cbac70ce2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,11 @@
-/nbproject/private/
-/nbproject/*~
+nbproject/private/
+nbproject/faces-config.NavData
+nbproject/genfiles.properties
+nbproject/*~
 /manifest.mf
 /build/
 /dist/
 /data/*
 /*.properties
-/*-ejb/nbproject/private/
-/*-ejb/nbproject/*~
-/*-ejb/build/
-/*-ejb/dist/
 .~lock*
 .gitcommits

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
deleted file mode 100644 (file)
index 612fb42..0000000
--- a/nbproject/faces-config.NavData
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scene Scope="Project" version="2">
-    <Scope Scope="Faces Configuration Only"/>
-    <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="2650" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="user/login_logout.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_delete.xhtml" x="2900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="2900" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="2400" y="600" zoom="true"/>
-        <Node id="admin/index.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="150" y="1650" zoom="true"/>
-        <Node id="customer/register.xhtml" x="2650" y="450" zoom="true"/>
-        <Node id="item_added.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="2400" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_show.xhtml" x="3150" y="150" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_edit.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="index.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="1900" y="750" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="customer/login.xhtml" x="900" y="1200" zoom="true"/>
-        <Node id="*" x="650" y="1350" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="2150" y="600" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="user/login.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="2150" y="750" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_export.xhtml" x="1150" y="1200" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="guest/user/resend_done.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/login_user_change_password.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="basket.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="exception.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="terms.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="1400" y="1050" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="1350" zoom="true"/>
-        <Node id="admin/user/admin_user_lock.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="1650" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="400" y="1650" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="user/login_user_change_personal_data.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="650" y="1500" zoom="true"/>
-        <Node id="imprint.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="150" y="1800" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="400" y="1500" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="user/login_user_change_email_address.xhtml" x="2650" y="150" zoom="true"/>
-    </Scope>
-    <Scope Scope="All Faces Configurations"/>
-</Scene>