Skip to content
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.

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

java class added from branch b1 #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Elegant_Calculator
Submodule Elegant_Calculator added at d02c9e
8 changes: 8 additions & 0 deletions app/src/androidTest/java/branch/sample_branch_b1.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package branch;

public class sample_branch_b1
{
String name, id;
float cgpa;

}
23 changes: 23 additions & 0 deletions app/src/main/java/master/master.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package master;

public class master {
int roll;
String name;
master(String a, int r)
{
this.name=a;
this.roll=r;
}

public int getRoll() {
return roll;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}
}