├── README.md ├── programmer.txt ├── simplicity.txt └── solve.txt /README.md: -------------------------------------------------------------------------------- 1 | # Try-Gitflow -------------------------------------------------------------------------------- /programmer.txt: -------------------------------------------------------------------------------- 1 | <<<<<<< HEAD 2 | A good programmer is someone who always looks both ways before crosing a one-way street. - Doug Linder 3 | ======= 4 | A good programmer is someone who always looks both ways before crossing a one-way street. 5 | >>>>>>> dev 6 | -------------------------------------------------------------------------------- /simplicity.txt: -------------------------------------------------------------------------------- 1 | <<<<<<< HEAD 2 | "Nature is pleased with simplicity. And nature is no dummy." - Isaac Newton 3 | ======= 4 | Simplicity is the soul of efficiency. 5 | >>>>>>> dev 6 | -------------------------------------------------------------------------------- /solve.txt: -------------------------------------------------------------------------------- 1 | First, solve the problem. Then, write the code. --------------------------------------------------------------------------------