Skip to content

link addition #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
rciphertext wants to merge 10 commits into
base: master
Choose a base branch
from
Open

link addition #2

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7229a26
Addition : Author Name : Ravindra Singh Pawar
rciphertext Jan 17, 2019
e790728
Added author name and date
Saga2149 Jan 17, 2019
55ccdad
Merge branch 'master' into master
rciphertext Jan 17, 2019
3d9fc1c
Merge pull request #1 from rciphertext/master
Saga2149 Jan 17, 2019
376d400
Commit by user1
Saga2149 Jan 17, 2019
edb47dd
added by user 2
Saga2149 Jan 17, 2019
5c3ca10
Commit by user1
Saga2149 Jan 17, 2019
330ca61
added by user 2
Saga2149 Jan 17, 2019
6037f91
Merge branch 'user1'
Saga2149 Jan 17, 2019
61216e4
Merge branch 'user2'
Saga2149 Jan 17, 2019
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
12 changes: 11 additions & 1 deletion calculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
author: Ravindra Singh Pawar (MT2018093)
*/


/****************Changes made by Saga2149*********************/
/****************Date: 17/01/2019 ****************************/
import java.util.Scanner;

public class calculator
Expand All @@ -19,12 +26,15 @@ public static void main(String args[])
choice = scan.next().charAt(0);
switch(choice)
{
/*This part added by user1*/
case '1' : System.out.print("Enter Two Number : ");
a = scan.nextFloat();
b = scan.nextFloat();
res = a + b;
System.out.print("Result = " + res);
break;
break;

/*This is by user2*/
case '2' : System.out.print("Enter Two Number : ");
a = scan.nextFloat();
b = scan.nextFloat();
Expand Down