0000000000000000000000000000000000000000 c0f1e9dc8120b7af66587894b3c2731154692516 khaled nabawy <khalednabawy7@gmail.com> 1583146195 +0200	clone: from https://github.com/khalednabawy/macpos.git
c0f1e9dc8120b7af66587894b3c2731154692516 61da239cfe8689caf51265bba4f19654bf7bc67c khaled nabawy <khalednabawy7@gmail.com> 1583161013 +0200	commit: carpet and branch controller
61da239cfe8689caf51265bba4f19654bf7bc67c 04a60f0555c1add781ffc4c91e0d4d7a0141aab6 khaled nabawy <khalednabawy7@gmail.com> 1583161702 +0200	commit: edit branch controller
04a60f0555c1add781ffc4c91e0d4d7a0141aab6 84ab801e9990062e5c9d3c25370f4427ec04ba1f khaled nabawy <khalednabawy7@gmail.com> 1583169142 +0200	commit: this is commit
84ab801e9990062e5c9d3c25370f4427ec04ba1f fbc449166567441d7609d9b813233627f7d7a41f khaled nabawy <khalednabawy7@gmail.com> 1583169176 +0200	pull --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
fbc449166567441d7609d9b813233627f7d7a41f 747c761b87f8543c53073d6c5267c3f36b1e0215 khaled nabawy <khalednabawy7@gmail.com> 1583169751 +0200	commit: add to doaa
747c761b87f8543c53073d6c5267c3f36b1e0215 fbc449166567441d7609d9b813233627f7d7a41f khaled nabawy <khalednabawy7@gmail.com> 1583169805 +0200	checkout: moving from master to doaa
fbc449166567441d7609d9b813233627f7d7a41f 747c761b87f8543c53073d6c5267c3f36b1e0215 khaled nabawy <khalednabawy7@gmail.com> 1583169811 +0200	merge master: Fast-forward
747c761b87f8543c53073d6c5267c3f36b1e0215 747c761b87f8543c53073d6c5267c3f36b1e0215 khaled nabawy <khalednabawy7@gmail.com> 1583224753 +0200	checkout: moving from doaa to master
747c761b87f8543c53073d6c5267c3f36b1e0215 c033aaa674c829827e1bf52c9e8df52040fce53b khaled nabawy <khalednabawy7@gmail.com> 1583225289 +0200	pull: Merge made by the 'recursive' strategy.
c033aaa674c829827e1bf52c9e8df52040fce53b 747c761b87f8543c53073d6c5267c3f36b1e0215 khaled nabawy <khalednabawy7@gmail.com> 1583225637 +0200	checkout: moving from master to doaa
747c761b87f8543c53073d6c5267c3f36b1e0215 c033aaa674c829827e1bf52c9e8df52040fce53b khaled nabawy <khalednabawy7@gmail.com> 1583225662 +0200	checkout: moving from doaa to master
c033aaa674c829827e1bf52c9e8df52040fce53b 593dd2bcea3154b5cab1244039a2445e38f1ae26 khaled nabawy <khalednabawy7@gmail.com> 1583226051 +0200	pull: Merge made by the 'recursive' strategy.
593dd2bcea3154b5cab1244039a2445e38f1ae26 9c14e25fb278e7419e8d48b63083b69bf5dca416 khaled nabawy <khalednabawy7@gmail.com> 1583226321 +0200	commit: edit errors
9c14e25fb278e7419e8d48b63083b69bf5dca416 1ee6202ad5ad940ade14025f72e75c7737f892ab khaled nabawy <khalednabawy7@gmail.com> 1583228072 +0200	commit: last change after editin tap
1ee6202ad5ad940ade14025f72e75c7737f892ab 4bdd5e378e64a04ce863af272a4779a6a54be23b khaled nabawy <khalednabawy7@gmail.com> 1583228099 +0200	pull --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
4bdd5e378e64a04ce863af272a4779a6a54be23b 229177d72008ade2459c68a0532035abbcea828a khaled nabawy <khalednabawy7@gmail.com> 1583237166 +0200	commit: add roomtypecontroller and getallrecord
229177d72008ade2459c68a0532035abbcea828a f67b2f68354c3ed7a9056f592fb601616657cb5c khaled nabawy <khalednabawy7@gmail.com> 1583237177 +0200	pull: Merge made by the 'recursive' strategy.
f67b2f68354c3ed7a9056f592fb601616657cb5c 87c7fde62abfe9d30386ba1eaf9406c80ed3063b khaled nabawy <khalednabawy7@gmail.com> 1583240464 +0200	commit: edit route
87c7fde62abfe9d30386ba1eaf9406c80ed3063b 47ebd77e6a61198340ef111844ff2790f9f737c1 khaled nabawy <khalednabawy7@gmail.com> 1583240550 +0200	commit (merge): fix
47ebd77e6a61198340ef111844ff2790f9f737c1 b064ec94968920547d9b890b1403de99f054c9fb khaled nabawy <khalednabawy7@gmail.com> 1583242414 +0200	commit: add sub form
b064ec94968920547d9b890b1403de99f054c9fb 8294efb388004a174530278c17ad34bd2127f6ac khaled nabawy <khalednabawy7@gmail.com> 1583242423 +0200	pull: Merge made by the 'recursive' strategy.
8294efb388004a174530278c17ad34bd2127f6ac 747c761b87f8543c53073d6c5267c3f36b1e0215 khaled nabawy <khalednabawy7@gmail.com> 1583242476 +0200	checkout: moving from master to doaa
747c761b87f8543c53073d6c5267c3f36b1e0215 8294efb388004a174530278c17ad34bd2127f6ac khaled nabawy <khalednabawy7@gmail.com> 1583242487 +0200	merge master: Fast-forward
8294efb388004a174530278c17ad34bd2127f6ac 8294efb388004a174530278c17ad34bd2127f6ac khaled nabawy <khalednabawy7@gmail.com> 1583242603 +0200	checkout: moving from doaa to master
8294efb388004a174530278c17ad34bd2127f6ac 84151801683b463bd8ac200c1462aaa4244a0188 khaled nabawy <khalednabawy7@gmail.com> 1583248518 +0200	commit: datatable
84151801683b463bd8ac200c1462aaa4244a0188 43f5b0ceec53692960e6229075e799d6bd424a82 khaled nabawy <khalednabawy7@gmail.com> 1583248946 +0200	commit: edit
43f5b0ceec53692960e6229075e799d6bd424a82 ad7c614e579d0a79648ca69d21e88dd58017e933 khaled nabawy <khalednabawy7@gmail.com> 1583249080 +0200	commit: edit
ad7c614e579d0a79648ca69d21e88dd58017e933 6559f9d248f3a6c172fdcabff05221a7b2f11418 khaled nabawy <khalednabawy7@gmail.com> 1583249543 +0200	commit (merge): conflict2
6559f9d248f3a6c172fdcabff05221a7b2f11418 a18433f3eb19e2ac1d309c398c12b4ce67c11182 khaled nabawy <khalednabawy7@gmail.com> 1583254520 +0200	commit: add datatable
a18433f3eb19e2ac1d309c398c12b4ce67c11182 09c3b415d847c60292485eea445dea700588b52e khaled nabawy <khalednabawy7@gmail.com> 1583254616 +0200	commit (merge): test
09c3b415d847c60292485eea445dea700588b52e 18baa73193945c725e7e38095a8eaf642534982e khaled nabawy <khalednabawy7@gmail.com> 1583311688 +0200	commit: last
18baa73193945c725e7e38095a8eaf642534982e d577133684d095f863df5f204381b44ad935726b khaled nabawy <khalednabawy7@gmail.com> 1583312294 +0200	commit: last2
d577133684d095f863df5f204381b44ad935726b 566884c1808aeb0dbac1f325ccdcfbd51f7c138b khaled nabawy <khalednabawy7@gmail.com> 1583312549 +0200	commit (merge): last conflict
566884c1808aeb0dbac1f325ccdcfbd51f7c138b 8abae68010a850d81a0912eaf0930096978fde39 khaled nabawy <khalednabawy7@gmail.com> 1583313848 +0200	commit: dfswds
8abae68010a850d81a0912eaf0930096978fde39 c9cd88c6f6f072d23cb2f1cf144441ef71f6ff1c khaled nabawy <khalednabawy7@gmail.com> 1583313977 +0200	commit (merge): Merge branch 'master' of https://github.com/khalednabawy/macpos
c9cd88c6f6f072d23cb2f1cf144441ef71f6ff1c 0b082c26e7258ba7895447c7597103163dddd052 khaled nabawy <khalednabawy7@gmail.com> 1583316554 +0200	commit: edit package
0b082c26e7258ba7895447c7597103163dddd052 e6003e8faffbf6be8dbf4f03f445c16674a51ec7 khaled nabawy <khalednabawy7@gmail.com> 1583316606 +0200	commit: last conflict
e6003e8faffbf6be8dbf4f03f445c16674a51ec7 a687ecc5db6b618e8bdf4d383c2cf8e84ae13ffd khaled nabawy <khalednabawy7@gmail.com> 1583316668 +0200	commit: edit style
a687ecc5db6b618e8bdf4d383c2cf8e84ae13ffd e5ab9ee7d8555202782e46f0a3776ef64873dd63 khaled nabawy <khalednabawy7@gmail.com> 1583316919 +0200	commit: remove from package checkbox
e5ab9ee7d8555202782e46f0a3776ef64873dd63 3d081e283366d10d7811d3b58906ba48998c098c khaled nabawy <khalednabawy7@gmail.com> 1583321448 +0200	commit: add request package
3d081e283366d10d7811d3b58906ba48998c098c 25c52adb3e1819fc2091c847b9e3d4256ac8a470 khaled nabawy <khalednabawy7@gmail.com> 1583321459 +0200	pull: Merge made by the 'recursive' strategy.
25c52adb3e1819fc2091c847b9e3d4256ac8a470 9566635318e16fa169a500d02f843237c02ecf47 khaled nabawy <khalednabawy7@gmail.com> 1583324464 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
9566635318e16fa169a500d02f843237c02ecf47 2b36870cfc60b8fc2bfd38f0e8c1c7d69a4617ea khaled nabawy <khalednabawy7@gmail.com> 1583324491 +0200	commit (merge): Merge branch 'master' of https://github.com/khalednabawy/macpos
2b36870cfc60b8fc2bfd38f0e8c1c7d69a4617ea 6c886e19ba0d463be3b0e8d59d9f9844839b666a khaled nabawy <khalednabawy7@gmail.com> 1583324644 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
6c886e19ba0d463be3b0e8d59d9f9844839b666a a463af57ff976897ea55516ee867d1a30055d2b4 khaled nabawy <khalednabawy7@gmail.com> 1583679535 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
a463af57ff976897ea55516ee867d1a30055d2b4 9d88ea062fd49ed6a08470120d1f0d01b177a9ee khaled nabawy <khalednabawy7@gmail.com> 1583681264 +0200	pull --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
9d88ea062fd49ed6a08470120d1f0d01b177a9ee e0b7844fd7dcdcc17d75fc9cb4b56870bf5aab70 khaled nabawy <khalednabawy7@gmail.com> 1583750447 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
e0b7844fd7dcdcc17d75fc9cb4b56870bf5aab70 51fb721efca8960b1af094b9af752adec6bf0497 khaled nabawy <khalednabawy7@gmail.com> 1583750475 +0200	commit (merge): Merge branch 'master' of https://github.com/khalednabawy/macpos
51fb721efca8960b1af094b9af752adec6bf0497 ca7ef1d4365ebca58f5a8bfca42679dd3ffa9fbc khaled nabawy <khalednabawy7@gmail.com> 1583760490 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
ca7ef1d4365ebca58f5a8bfca42679dd3ffa9fbc ac803f4e83eb00c21d77ff3c3ca8c720bec3d62f khaled nabawy <khalednabawy7@gmail.com> 1583841448 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
ac803f4e83eb00c21d77ff3c3ca8c720bec3d62f f5dfeda77f1fce0938ca58fa5878bcf8b7a7d50e khaled nabawy <khalednabawy7@gmail.com> 1583841459 +0200	pull --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
f5dfeda77f1fce0938ca58fa5878bcf8b7a7d50e 6051939eeb50df8cbbdeeb731e215f91748bcc15 khaled nabawy <khalednabawy7@gmail.com> 1583847585 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
6051939eeb50df8cbbdeeb731e215f91748bcc15 56c7543aa823bb96571e7b1e212b1ae0f352b531 khaled nabawy <khalednabawy7@gmail.com> 1583847594 +0200	pull --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
56c7543aa823bb96571e7b1e212b1ae0f352b531 00bd2f3492d97c46e7b5239c92fae6a3679dde3f khaled nabawy <khalednabawy7@gmail.com> 1583851107 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
00bd2f3492d97c46e7b5239c92fae6a3679dde3f 4861539d0d887b4f8ce05fdc746d93482692ae3e khaled nabawy <khalednabawy7@gmail.com> 1583851155 +0200	pull --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
4861539d0d887b4f8ce05fdc746d93482692ae3e 1b8b37e3fb7208687beaddc6f234b670762e91eb khaled nabawy <khalednabawy7@gmail.com> 1583927396 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
1b8b37e3fb7208687beaddc6f234b670762e91eb 5da52234ef3a8d6e4cc13f98830b369ac4912d35 khaled nabawy <khalednabawy7@gmail.com> 1583927643 +0200	commit (merge): Merge branch 'master' of https://github.com/khalednabawy/macpos
5da52234ef3a8d6e4cc13f98830b369ac4912d35 c8a80073dbe33a5d94c58b10a041cfd6b0c1ddc2 khaled nabawy <khalednabawy7@gmail.com> 1583938426 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
c8a80073dbe33a5d94c58b10a041cfd6b0c1ddc2 5225e86f57cea65eabbd7ad1fbd39a8cf0274720 khaled nabawy <khalednabawy7@gmail.com> 1583939612 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
5225e86f57cea65eabbd7ad1fbd39a8cf0274720 38969d74bfae3a5eb0a8f59076b752e81092e16f khaled nabawy <khalednabawy7@gmail.com> 1583953298 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
38969d74bfae3a5eb0a8f59076b752e81092e16f eab0ad62531227cb0d4409a430b8e7ad686299a1 khaled nabawy <khalednabawy7@gmail.com> 1583953337 +0200	commit (merge): Merge branch 'master' of https://github.com/khalednabawy/macpos
eab0ad62531227cb0d4409a430b8e7ad686299a1 9456b7d5fb42df2731924adeb96a5cc740fb4ea6 khaled nabawy <khalednabawy7@gmail.com> 1583954895 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
9456b7d5fb42df2731924adeb96a5cc740fb4ea6 06d3394874bcef31b5e15d391a2c0ecaa335c109 khaled nabawy <khalednabawy7@gmail.com> 1583954916 +0200	commit (merge): Merge branch 'master' of https://github.com/khalednabawy/macpos
06d3394874bcef31b5e15d391a2c0ecaa335c109 1025cdd74cd83755e70c9366c4bc2fdbecdfb137 khaled nabawy <khalednabawy7@gmail.com> 1584012822 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
1025cdd74cd83755e70c9366c4bc2fdbecdfb137 7972de78d59c090be27f2c4166aaf1510e335702 khaled nabawy <khalednabawy7@gmail.com> 1584200978 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
7972de78d59c090be27f2c4166aaf1510e335702 762bf44135338cddce4d4853532cd1cf3f49759b khaled nabawy <khalednabawy7@gmail.com> 1584200994 +0200	pull --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
762bf44135338cddce4d4853532cd1cf3f49759b 40a15e9cf2c9ec2d08660ad3ac5d355c5067b93a khaled nabawy <khalednabawy7@gmail.com> 1584201165 +0200	commit: Merge branch 'master' of https://github.com/khalednabawy/macpos
