Skip to content

Develop -> Master 2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DCollart wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Develop -> Master 2 #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
821ae99
second commit
DCollart Nov 9, 2022
8c2d144
third commit
DCollart Nov 9, 2022
ca5f1ec
fourth commit
DCollart Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eu vulputate massa, quis faucibus lectus. Phasellus mi ex, commodo sit amet molestie sed, efficitur eu ligula. Cras non dignissim leo, ut scelerisque magna. Pellentesque volutpat, sapien rhoncus venenatis consequat, diam augue aliquam dolor, in varius lorem nibh quis lacus. Cras et risus massa. Aenean rutrum condimentum ex, sed laoreet nibh bibendum eu. Vivamus id condimentum velit. Nullam nunc eros, fermentum quis ultricies in, egestas sit amet turpis.
Franklin Patrick "Frank" Herbert Jr. (October 8, 1920 – February 11, 1986) was an American science fiction author best known for the 1965 novel Dune and its five sequels. Though he became famous for his novels, he also wrote short stories and worked as a newspaper journalist, photographer, book reviewer, ecological consultant, and lecturer.

Sed a nibh vitae leo facilisis porttitor. Praesent vel commodo justo. Nulla varius nibh erat, sed vestibulum nibh malesuada sed. Duis ac dapibus mauris. Suspendisse potenti. Nulla eu iaculis lacus. Praesent hendrerit sollicitudin nibh, sed placerat elit tincidunt sit amet. Aliquam malesuada malesuada pretium. Proin sed quam ut sem sagittis convallis. Nunc quis scelerisque quam, id convallis leo. Nunc finibus leo dolor, non euismod diam vulputate non. Nullam ac libero metus. Vestibulum et lorem vitae ante dapibus faucibus. Ut ac nunc sit amet justo tristique faucibus in eget quam. Ut consequat at orci non eleifend.

Ut porttitor felis vel iaculis pulvinar. Suspendisse potenti. Maecenas nulla risus, egestas quis lacinia sit amet, efficitur eget lectus. Donec et augue interdum, bibendum velit eu, tristique nunc. Etiam urna lorem, venenatis lobortis libero ut, porta condimentum diam. Vivamus luctus nec neque in tincidunt. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean dapibus ultricies velit, iaculis fringilla erat tempor ut. Pellentesque ullamcorper neque eget lobortis molestie. Ut gravida justo ac nibh tincidunt, vel aliquam arcu porttitor.

Cras et nisi at lectus pulvinar gravida. Maecenas blandit velit in viverra accumsan. In placerat vehicula tortor sed ullamcorper. Phasellus eu nulla neque. Vestibulum leo felis, ultrices in urna posuere, mattis rutrum ligula. Vivamus id sapien id lacus efficitur maximus. Etiam ut elit pretium, volutpat nisl consectetur, blandit mauris. Maecenas rhoncus libero ac turpis sagittis, ut tincidunt massa cursus. Donec pulvinar tortor non enim sollicitudin, vel suscipit nisl vehicula. Donec accumsan scelerisque odio.

Ut elementum imperdiet risus non fringilla. Sed neque elit, eleifend mollis orci et, faucibus laoreet ligula. Donec lacus libero, blandit quis nisl a, vehicula vulputate nibh. Integer nec magna metus. Sed eget cursus nunc. Maecenas congue massa a sapien ullamcorper malesuada. Praesent posuere velit ex, id maximus urna feugiat sit amet. Etiam quam eros, dapibus non nulla in, rhoncus blandit sem.
The Dune saga, set in the distant future, and taking place over millennia, explores complex themes, such as the long-term survival of the human species, human evolution, planetary science and ecology, and the intersection of religion, politics, economics and power in a future where humanity has long since developed interstellar travel and settled many thousands of worlds. Dune is the best-selling science fiction novel of all time,[4] and the entire series is considered to be among the classics of the genre.