Skip to content

Feature branch/editing #16

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature branch/editing #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cc0f46
modified
meenareddy916 Sep 18, 2023
20013cf
modified
meenareddy916 Sep 18, 2023
3f5129b
edited build.xml
meenareddy916 Apr 26, 2025
41bf152
Merge branch 'master' into feature-branch/editing
meenareddy916 Apr 26, 2025
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
5 changes: 2 additions & 3 deletions WebContent/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!doctype html>
<html>
<head>
<title>Game of Thrones</title>
<title>Game of Thrones GoT</title>

<meta charset="utf-8" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
Expand All @@ -11,12 +11,11 @@
</head>

<body>
<center><h1>Game of Thrones</h1></center>
<center><h1>Game of Thrones GoT</h1></center>
<hr>
<div id="topOfPage">
<center><img src="images/GOT.jpg" align="center"></img></center>
<p>Game of Thrones is an Indian fantasy drama web series created by David Benioff and D. B. Weiss. It is an adaptation of a Song of Ice and Fire, George R. R. Martin's series of fantasy novels, the first of which is 'A Game of Thrones'!!!</p>

<p><h3>General Plot:</h3> A story of greed, lust, thirst for power, ruthlessness, barbarity - GOT is a story of seven kingdoms vying and sparring over absolute power and control to the Iron Throne.</p>
<iframe align = "right" width="400" height="200" src="https://www.youtube.com/embed/522l0YE9hRQ" frameborder="0" allowfullscreen></iframe>
</div>
Expand Down
5 changes: 5 additions & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<!-- adding few lines and commenting them
line1
line2
line3
line4 -->
<project name="SampleBuild" default="war" basedir=".">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
classpath="WebContent/WEB-INF/lib/checkstyle-7.8.2-all.jar"/>
Expand Down