Skip to content

Commit 4a028b5

Browse files
authored
Update README.md
1 parent e0e4204 commit 4a028b5

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

README.md

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ This repository holds the Android App for performing experiments with [PSLab](ht
119119

120120
## How to set up the Android app in your development environment
121121

122-
123122
### Application Flavors
124123

125124
There are 2 flavors (build variants) of PSLab Android application.
@@ -218,17 +217,9 @@ Despite any reason, follow the steps given below to squash all commits into one
218217
### Branch Policy
219218

220219
We have the following branches
221-
* **development**
222-
All development goes on in this branch. If you're making a contribution,
223-
you are supposed to make a pull request to _development_.
224-
Make sure it passes a build check on Travis.
225-
226-
* **master**
227-
This contains the stable code. After significant features/bugfixes are accumulated on development, we move it to master.
228-
229-
* **apk**
230-
This branch contains automatically generated apk file for testing.
231-
220+
* **development** All development goes on in this branch. If you're making a contribution, you are supposed to make a pull request to _development_. Make sure it passes a build check on Travis.
221+
* **master** This contains the stable code. After significant features/bugfixes are accumulated on development, we move it to master.
222+
* **apk** This branch contains automatically generated apk file for testing.
232223

233224
### Code style
234225

@@ -239,19 +230,18 @@ Please try to follow the mentioned guidelines while writing and submitting your
239230
* The activity/fragment file name corresponding to the layout files should be named as (activity/fragment name)(activity/fragment).java like ```ChannelsParameterFragment.java``` corresponding to the layout file ```fragment_channels_parameter.xml``` .
240231
* The corresponding widgets for buttons, textboxes, checkboxes etc. in activity files should be named as (viewtype/widget)(fragment/activity name)(no. in the file) like ```spinnerChannelSelect1``` corresponding to ```spinner_channel_select1``` .
241232

242-
## License
243-
244-
This project is currently licensed under the Apache License 2.0. A copy of [LICENSE](LICENSE) is to be present along with the source code. To obtain the software under a different license, please contact FOSSASIA.
233+
## Developers
245234

246-
## Maintainers
235+
### Maintainers
247236
The project is maintained by
248237
- Padmal ([@CloudyPadmal](https://github.com/CloudyPadmal))
249238
- Mario Behling ([@mariobehling](http://github.com/mariobehling))
250239
- Lorenz Gerber ([@lorenzgerber](https://github.com/lorenzgerber))
251240
- Wei Tat ([@cweitat](https://github.com/cweitat))
252241
- Wai Gie ([@woshikie](https://github.com/woshikie))
253242
- Neel Trivedi ([@neel1998](https://github.com/neel1998))
254-
## Alumni
243+
244+
### Alumni
255245
- Praveen Patil ([@wavicles](https://github.com/wavicles))
256246
- Jithin ([@jithinbp](https://github.com/jithinbp))
257247
- Akarshan Gandotra ([@akarshan96](https://github.com/akarshan96))
@@ -261,3 +251,7 @@ The project is maintained by
261251
- Abhinav ([@abhinavraj23](https://github.com/abhinavraj23))
262252
- Harsh ([@harsh-2711](https://github.com/harsh-2711))
263253
- Yatri ([@yatri1609](https://github.com/yatri1609))
254+
255+
## License
256+
257+
This project is currently licensed under the Apache License 2.0. A copy of [LICENSE](LICENSE) is to be present along with the source code. To obtain the software under a different license, please contact FOSSASIA.

0 commit comments

Comments
 (0)