-
Notifications
You must be signed in to change notification settings - Fork 1
/
wdnndtf3.0ek.txt
137 lines (133 loc) · 6.74 KB
/
wdnndtf3.0ek.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
Merge remote-tracking branch 'origin/master'
# Conflicts:
# tmp/bytecode/DEV/_app_views_AppLogs_logsManage.html
# tmp/bytecode/DEV/_app_views_Products_menuManage.html
# tmp/bytecode/DEV/_app_views_Vendors_manage.html
# tmp/bytecode/DEV/_app_views_errors_404.html
# tmp/bytecode/DEV/_app_views_include_deleteConfirmDialog.html
# tmp/bytecode/DEV/_app_views_include_formValidation.html
# tmp/bytecode/DEV/_app_views_include_formatNumber.html
# tmp/bytecode/DEV/_app_views_include_tableWithFilterHead.html
# tmp/bytecode/DEV/_app_views_productsMain.html
# tmp/bytecode/DEV/_module_crudsiena-2.0.1__app_views_tags_crud_types.tag
# tmp/bytecode/DEV/_module_crudsiena-2.0.1__conf_routes
# tmp/bytecode/DEV/controllers.CRUD$For
# tmp/bytecode/DEV/controllers.CRUD$Hidden
# tmp/bytecode/DEV/controllers.CRUD$ObjectType
# tmp/bytecode/DEV/controllers.CRUD$ObjectType$ObjectField
# tmp/bytecode/DEV/controllers.MeasureTypes
# tmp/bytecode/DEV/controllers.MeasureUnits
# tmp/bytecode/DEV/controllers.Products
# tmp/bytecode/DEV/controllers.Vendor_Products
# tmp/bytecode/DEV/controllers.Vendors
# tmp/bytecode/DEV/models.Brand
# tmp/bytecode/DEV/models.MeasureType
# tmp/bytecode/DEV/models.MeasureUnit
# tmp/bytecode/DEV/models.PVendor
# tmp/bytecode/DEV/models.Product
# tmp/bytecode/DEV/models.Product_MeasureUnit
# tmp/bytecode/DEV/models.Product_product_Composition
# tmp/bytecode/DEV/models.Vendor_Product
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: .classpath
#
# Changes not staged for commit:
# modified: app/controllers/Api.java
# modified: app/models/Category.java
# modified: app/models/Product.java
# modified: tmp/bytecode/DEV/DocViewerPlugin
# deleted: tmp/bytecode/DEV/_app_views_Accounts_accountsReports.html
# deleted: tmp/bytecode/DEV/_app_views_Accounts_displayAllAccounts.html
# deleted: tmp/bytecode/DEV/_app_views_Accounts_updateAccountForm.html
# deleted: tmp/bytecode/DEV/_app_views_Application_employeeLoginForm.html
# deleted: tmp/bytecode/DEV/_app_views_Application_index.html
# deleted: tmp/bytecode/DEV/_app_views_Brands_manage.html
# deleted: tmp/bytecode/DEV/_app_views_Categories_manage.html
# deleted: tmp/bytecode/DEV/_app_views_Categories_menuCategoryForm.html
# deleted: tmp/bytecode/DEV/_app_views_Categories_menuManage.html
# deleted: tmp/bytecode/DEV/_app_views_Employees_employeeChangePasswordForm.html
# deleted: tmp/bytecode/DEV/_app_views_Employees_manage.html
# deleted: tmp/bytecode/DEV/_app_views_MeasureTypes_manage.html
# deleted: tmp/bytecode/DEV/_app_views_MeasureUnits_manage.html
# deleted: tmp/bytecode/DEV/_app_views_Products_manage.html
# deleted: tmp/bytecode/DEV/_app_views_Products_menuProductForm.html
# deleted: tmp/bytecode/DEV/_app_views_Products_productComposition.html
# deleted: tmp/bytecode/DEV/_app_views_Products_productForm.html
# deleted: tmp/bytecode/DEV/_app_views_Vendors_vendorProductsForm.html
# deleted: tmp/bytecode/DEV/_app_views_Vendors_vendorsForm.html
# deleted: tmp/bytecode/DEV/_app_views_accountMain.html
# deleted: tmp/bytecode/DEV/_app_views_employeeMain.html
# deleted: tmp/bytecode/DEV/_app_views_errors_500.html
# deleted: tmp/bytecode/DEV/_app_views_include_formHead.html
# deleted: tmp/bytecode/DEV/_app_views_include_pagination.html
# deleted: tmp/bytecode/DEV/_app_views_include_paginationMeasureUnit.html
# deleted: tmp/bytecode/DEV/_app_views_include_paginationmenu.html
# deleted: tmp/bytecode/DEV/_app_views_include_topbarMenu.html
# deleted: tmp/bytecode/DEV/_app_views_main.html
# deleted: tmp/bytecode/DEV/_app_views_stockMain.html
# deleted: tmp/bytecode/DEV/_play__framework_templates_errors_404.txt
# deleted: tmp/bytecode/DEV/_play__framework_templates_tags_404.html
# deleted: tmp/bytecode/DEV/_play__framework_templates_tags_500.html
# modified: tmp/bytecode/DEV/controllers.Accounts
# modified: tmp/bytecode/DEV/controllers.Api
# modified: tmp/bytecode/DEV/controllers.AppLogs
# modified: tmp/bytecode/DEV/controllers.Application
# modified: tmp/bytecode/DEV/controllers.Brands
# modified: tmp/bytecode/DEV/controllers.CRUD
# modified: tmp/bytecode/DEV/controllers.CRUD$Exclude
# modified: tmp/bytecode/DEV/controllers.CRUD$For
# modified: tmp/bytecode/DEV/controllers.CRUD$Hidden
# modified: tmp/bytecode/DEV/controllers.CRUD$ObjectType
# modified: tmp/bytecode/DEV/controllers.CRUD$ObjectType$ObjectField
# modified: tmp/bytecode/DEV/controllers.Categories
# modified: tmp/bytecode/DEV/controllers.Employees
# modified: tmp/bytecode/DEV/controllers.PlayDocumentation
# modified: tmp/bytecode/DEV/controllers.Transactions
# modified: tmp/bytecode/DEV/helpers.CheatSheetHelper
# modified: tmp/bytecode/DEV/helpers.CheatSheetHelper$1
# modified: tmp/bytecode/DEV/helpers.CheatSheetHelper$2
# modified: tmp/bytecode/DEV/helpers.CheatSheetHelper$3
# modified: tmp/bytecode/DEV/models.Account
# modified: tmp/bytecode/DEV/models.AppLog
# modified: tmp/bytecode/DEV/models.Brand
# modified: tmp/bytecode/DEV/models.Category
# modified: tmp/bytecode/DEV/models.Client
# modified: tmp/bytecode/DEV/models.Country
# modified: tmp/bytecode/DEV/models.Employee
# modified: tmp/bytecode/DEV/models.MeasureType
# modified: tmp/bytecode/DEV/models.MeasureUnit
# modified: tmp/bytecode/DEV/models.PVendor
# modified: tmp/bytecode/DEV/models.Product
# modified: tmp/bytecode/DEV/models.Product_MeasureUnit
# modified: tmp/bytecode/DEV/models.Product_product_Composition
# modified: tmp/bytecode/DEV/models.Transaction
# modified: tmp/bytecode/DEV/models.Unit
# modified: tmp/bytecode/DEV/utils.Enums
# modified: tmp/bytecode/DEV/utils.Enums$LogType
# modified: tmp/bytecode/DEV/utils.Enums$MeasureUnitMode
# modified: tmp/bytecode/DEV/utils.Enums$MesureUnit
# modified: tmp/bytecode/DEV/utils.Enums$ProductStatus
# modified: tmp/bytecode/DEV/utils.Enums$ProductStatus$DiscountType
# modified: tmp/bytecode/DEV/utils.Enums$ProductType
# modified: tmp/bytecode/DEV/utils.Enums$ShippingMethod
# modified: tmp/bytecode/DEV/utils.Enums$VendorPaymentType_ID
# modified: tmp/bytecode/DEV/utils.Enums$VendorType
# modified: tmp/bytecode/DEV/utils.Enums$categoryType
# modified: tmp/bytecode/DEV/utils.Enums$clientType
# modified: tmp/bytecode/DEV/utils.Enums$saleOrderType
# modified: tmp/bytecode/DEV/utils.Pagination
#